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

@@ -1,134 +1,20 @@
package integration
import (
"bytes"
"context"
"encoding/json"
"fmt"
"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"
"github.com/break/junhong_cmp_fiber/pkg/constants"
"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 carrierTestEnv struct {
db *gorm.DB
rdb *redis.Client
tokenManager *auth.TokenManager
app *fiber.App
adminToken string
t *testing.T
}
func setupCarrierTestEnv(t *testing.T) *carrierTestEnv {
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 &carrierTestEnv{
db: db,
rdb: rdb,
tokenManager: tokenManager,
app: app,
adminToken: adminToken,
t: t,
}
}
func (e *carrierTestEnv) teardown() {
e.db.Exec("DELETE FROM tb_carrier WHERE carrier_code 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 TestCarrier_CRUD(t *testing.T) {
env := setupCarrierTestEnv(t)
defer env.teardown()
env := integ.NewIntegrationTestEnv(t)
var createdCarrierID uint
@@ -141,11 +27,7 @@ func TestCarrier_CRUD(t *testing.T) {
}
jsonBody, _ := json.Marshal(body)
req := httptest.NewRequest("POST", "/api/admin/carriers", bytes.NewReader(jsonBody))
req.Header.Set("Content-Type", "application/json")
req.Header.Set("Authorization", "Bearer "+env.adminToken)
resp, err := env.app.Test(req, -1)
resp, err := env.AsSuperAdmin().Request("POST", "/api/admin/carriers", jsonBody)
require.NoError(t, err)
defer resp.Body.Close()
@@ -175,11 +57,7 @@ func TestCarrier_CRUD(t *testing.T) {
}
jsonBody, _ := json.Marshal(body)
req := httptest.NewRequest("POST", "/api/admin/carriers", bytes.NewReader(jsonBody))
req.Header.Set("Content-Type", "application/json")
req.Header.Set("Authorization", "Bearer "+env.adminToken)
resp, err := env.app.Test(req, -1)
resp, err := env.AsSuperAdmin().Request("POST", "/api/admin/carriers", jsonBody)
require.NoError(t, err)
defer resp.Body.Close()
@@ -191,10 +69,7 @@ func TestCarrier_CRUD(t *testing.T) {
t.Run("获取运营商详情", func(t *testing.T) {
url := fmt.Sprintf("/api/admin/carriers/%d", createdCarrierID)
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()
@@ -210,10 +85,7 @@ func TestCarrier_CRUD(t *testing.T) {
})
t.Run("获取不存在的运营商", func(t *testing.T) {
req := httptest.NewRequest("GET", "/api/admin/carriers/99999", nil)
req.Header.Set("Authorization", "Bearer "+env.adminToken)
resp, err := env.app.Test(req, -1)
resp, err := env.AsSuperAdmin().Request("GET", "/api/admin/carriers/99999", nil)
require.NoError(t, err)
defer resp.Body.Close()
@@ -231,11 +103,7 @@ func TestCarrier_CRUD(t *testing.T) {
jsonBody, _ := json.Marshal(body)
url := fmt.Sprintf("/api/admin/carriers/%d", createdCarrierID)
req := httptest.NewRequest("PUT", url, bytes.NewReader(jsonBody))
req.Header.Set("Content-Type", "application/json")
req.Header.Set("Authorization", "Bearer "+env.adminToken)
resp, err := env.app.Test(req, -1)
resp, err := env.AsSuperAdmin().Request("PUT", url, jsonBody)
require.NoError(t, err)
defer resp.Body.Close()
@@ -258,11 +126,7 @@ func TestCarrier_CRUD(t *testing.T) {
jsonBody, _ := json.Marshal(body)
url := fmt.Sprintf("/api/admin/carriers/%d/status", createdCarrierID)
req := httptest.NewRequest("PUT", url, bytes.NewReader(jsonBody))
req.Header.Set("Content-Type", "application/json")
req.Header.Set("Authorization", "Bearer "+env.adminToken)
resp, err := env.app.Test(req, -1)
resp, err := env.AsSuperAdmin().Request("PUT", url, jsonBody)
require.NoError(t, err)
defer resp.Body.Close()
@@ -274,16 +138,13 @@ func TestCarrier_CRUD(t *testing.T) {
assert.Equal(t, 0, result.Code)
var carrier model.Carrier
env.db.First(&carrier, createdCarrierID)
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)
req := httptest.NewRequest("DELETE", url, nil)
req.Header.Set("Authorization", "Bearer "+env.adminToken)
resp, err := env.app.Test(req, -1)
resp, err := env.AsSuperAdmin().Request("DELETE", url, nil)
require.NoError(t, err)
defer resp.Body.Close()
@@ -295,14 +156,13 @@ func TestCarrier_CRUD(t *testing.T) {
assert.Equal(t, 0, result.Code)
var carrier model.Carrier
err = env.db.First(&carrier, createdCarrierID).Error
err = env.RawDB().First(&carrier, createdCarrierID).Error
assert.Error(t, err, "删除后应查不到运营商")
})
}
func TestCarrier_List(t *testing.T) {
env := setupCarrierTestEnv(t)
defer env.teardown()
env := integ.NewIntegrationTestEnv(t)
carriers := []*model.Carrier{
{CarrierCode: "TEST_LIST_001", CarrierName: "移动列表测试1", CarrierType: constants.CarrierTypeCMCC, Status: constants.StatusEnabled},
@@ -310,16 +170,13 @@ func TestCarrier_List(t *testing.T) {
{CarrierCode: "TEST_LIST_003", CarrierName: "电信列表测试", CarrierType: constants.CarrierTypeCTCC, Status: constants.StatusEnabled},
}
for _, c := range carriers {
require.NoError(t, env.db.Create(c).Error)
require.NoError(t, env.TX.Create(c).Error)
}
carriers[2].Status = constants.StatusDisabled
require.NoError(t, env.db.Save(carriers[2]).Error)
require.NoError(t, env.TX.Save(carriers[2]).Error)
t.Run("获取运营商列表-无过滤", func(t *testing.T) {
req := httptest.NewRequest("GET", "/api/admin/carriers?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/carriers?page=1&page_size=20", nil)
require.NoError(t, err)
defer resp.Body.Close()
@@ -332,10 +189,7 @@ func TestCarrier_List(t *testing.T) {
})
t.Run("获取运营商列表-按类型过滤", func(t *testing.T) {
req := httptest.NewRequest("GET", "/api/admin/carriers?carrier_type=CMCC", nil)
req.Header.Set("Authorization", "Bearer "+env.adminToken)
resp, err := env.app.Test(req, -1)
resp, err := env.AsSuperAdmin().Request("GET", "/api/admin/carriers?carrier_type=CMCC", nil)
require.NoError(t, err)
defer resp.Body.Close()
@@ -348,10 +202,7 @@ func TestCarrier_List(t *testing.T) {
})
t.Run("获取运营商列表-按名称模糊搜索", func(t *testing.T) {
req := httptest.NewRequest("GET", "/api/admin/carriers?carrier_name=联通", nil)
req.Header.Set("Authorization", "Bearer "+env.adminToken)
resp, err := env.app.Test(req, -1)
resp, err := env.AsSuperAdmin().Request("GET", "/api/admin/carriers?carrier_name=联通", nil)
require.NoError(t, err)
defer resp.Body.Close()
@@ -364,10 +215,7 @@ func TestCarrier_List(t *testing.T) {
})
t.Run("获取运营商列表-按状态过滤", func(t *testing.T) {
req := httptest.NewRequest("GET", fmt.Sprintf("/api/admin/carriers?status=%d", constants.StatusDisabled), nil)
req.Header.Set("Authorization", "Bearer "+env.adminToken)
resp, err := env.app.Test(req, -1)
resp, err := env.AsSuperAdmin().Request("GET", fmt.Sprintf("/api/admin/carriers?status=%d", constants.StatusDisabled), nil)
require.NoError(t, err)
defer resp.Body.Close()
@@ -380,9 +228,7 @@ func TestCarrier_List(t *testing.T) {
})
t.Run("未认证请求应返回错误", func(t *testing.T) {
req := httptest.NewRequest("GET", "/api/admin/carriers", nil)
resp, err := env.app.Test(req, -1)
resp, err := env.ClearAuth().Request("GET", "/api/admin/carriers", nil)
require.NoError(t, err)
defer resp.Body.Close()