feat: 实现门店套餐分配功能并统一测试基础设施
All checks were successful
构建并部署到测试环境(无 SSH) / build-and-deploy (push) Successful in 5m30s
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:
@@ -1,137 +1,20 @@
|
||||
package integration
|
||||
|
||||
import (
|
||||
"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 deviceTestEnv struct {
|
||||
db *gorm.DB
|
||||
rdb *redis.Client
|
||||
tokenManager *auth.TokenManager
|
||||
app *fiber.App
|
||||
adminToken string
|
||||
t *testing.T
|
||||
}
|
||||
|
||||
func setupDeviceTestEnv(t *testing.T) *deviceTestEnv {
|
||||
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 &deviceTestEnv{
|
||||
db: db,
|
||||
rdb: rdb,
|
||||
tokenManager: tokenManager,
|
||||
app: app,
|
||||
adminToken: adminToken,
|
||||
t: t,
|
||||
}
|
||||
}
|
||||
|
||||
func (e *deviceTestEnv) teardown() {
|
||||
// 清理测试数据
|
||||
e.db.Exec("DELETE FROM tb_device WHERE device_no LIKE 'TEST%'")
|
||||
e.db.Exec("DELETE FROM tb_device_sim_binding WHERE device_id IN (SELECT id FROM tb_device WHERE device_no LIKE 'TEST%')")
|
||||
e.db.Exec("DELETE FROM tb_device_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 TestDevice_List(t *testing.T) {
|
||||
env := setupDeviceTestEnv(t)
|
||||
defer env.teardown()
|
||||
env := integ.NewIntegrationTestEnv(t)
|
||||
|
||||
// 创建测试设备
|
||||
devices := []*model.Device{
|
||||
@@ -140,14 +23,11 @@ func TestDevice_List(t *testing.T) {
|
||||
{DeviceNo: "TEST_DEVICE_003", DeviceName: "测试设备3", DeviceType: "mifi", MaxSimSlots: 1, Status: constants.DeviceStatusDistributed},
|
||||
}
|
||||
for _, device := range devices {
|
||||
require.NoError(t, env.db.Create(device).Error)
|
||||
require.NoError(t, env.TX.Create(device).Error)
|
||||
}
|
||||
|
||||
t.Run("获取设备列表-无过滤", func(t *testing.T) {
|
||||
req := httptest.NewRequest("GET", "/api/admin/devices?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/devices?page=1&page_size=20", nil)
|
||||
require.NoError(t, err)
|
||||
defer resp.Body.Close()
|
||||
|
||||
@@ -160,10 +40,7 @@ func TestDevice_List(t *testing.T) {
|
||||
})
|
||||
|
||||
t.Run("获取设备列表-按设备类型过滤", func(t *testing.T) {
|
||||
req := httptest.NewRequest("GET", "/api/admin/devices?device_type=router", nil)
|
||||
req.Header.Set("Authorization", "Bearer "+env.adminToken)
|
||||
|
||||
resp, err := env.app.Test(req, -1)
|
||||
resp, err := env.AsSuperAdmin().Request("GET", "/api/admin/devices?device_type=router", nil)
|
||||
require.NoError(t, err)
|
||||
defer resp.Body.Close()
|
||||
|
||||
@@ -176,10 +53,7 @@ func TestDevice_List(t *testing.T) {
|
||||
})
|
||||
|
||||
t.Run("获取设备列表-按状态过滤", func(t *testing.T) {
|
||||
req := httptest.NewRequest("GET", fmt.Sprintf("/api/admin/devices?status=%d", constants.DeviceStatusInStock), 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/devices?status=%d", constants.DeviceStatusInStock), nil)
|
||||
require.NoError(t, err)
|
||||
defer resp.Body.Close()
|
||||
|
||||
@@ -192,9 +66,7 @@ func TestDevice_List(t *testing.T) {
|
||||
})
|
||||
|
||||
t.Run("未认证请求应返回错误", func(t *testing.T) {
|
||||
req := httptest.NewRequest("GET", "/api/admin/devices", nil)
|
||||
|
||||
resp, err := env.app.Test(req, -1)
|
||||
resp, err := env.ClearAuth().Request("GET", "/api/admin/devices", nil)
|
||||
require.NoError(t, err)
|
||||
defer resp.Body.Close()
|
||||
|
||||
@@ -206,8 +78,7 @@ func TestDevice_List(t *testing.T) {
|
||||
}
|
||||
|
||||
func TestDevice_GetByID(t *testing.T) {
|
||||
env := setupDeviceTestEnv(t)
|
||||
defer env.teardown()
|
||||
env := integ.NewIntegrationTestEnv(t)
|
||||
|
||||
// 创建测试设备
|
||||
device := &model.Device{
|
||||
@@ -217,14 +88,11 @@ func TestDevice_GetByID(t *testing.T) {
|
||||
MaxSimSlots: 4,
|
||||
Status: constants.DeviceStatusInStock,
|
||||
}
|
||||
require.NoError(t, env.db.Create(device).Error)
|
||||
require.NoError(t, env.TX.Create(device).Error)
|
||||
|
||||
t.Run("获取设备详情-成功", func(t *testing.T) {
|
||||
url := fmt.Sprintf("/api/admin/devices/%d", device.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()
|
||||
|
||||
@@ -242,10 +110,7 @@ func TestDevice_GetByID(t *testing.T) {
|
||||
})
|
||||
|
||||
t.Run("获取不存在的设备-应返回错误", func(t *testing.T) {
|
||||
req := httptest.NewRequest("GET", "/api/admin/devices/999999", nil)
|
||||
req.Header.Set("Authorization", "Bearer "+env.adminToken)
|
||||
|
||||
resp, err := env.app.Test(req, -1)
|
||||
resp, err := env.AsSuperAdmin().Request("GET", "/api/admin/devices/999999", nil)
|
||||
require.NoError(t, err)
|
||||
defer resp.Body.Close()
|
||||
|
||||
@@ -257,10 +122,8 @@ func TestDevice_GetByID(t *testing.T) {
|
||||
}
|
||||
|
||||
func TestDevice_Delete(t *testing.T) {
|
||||
env := setupDeviceTestEnv(t)
|
||||
defer env.teardown()
|
||||
env := integ.NewIntegrationTestEnv(t)
|
||||
|
||||
// 创建测试设备
|
||||
device := &model.Device{
|
||||
DeviceNo: "TEST_DEVICE_DEL_001",
|
||||
DeviceName: "测试删除设备",
|
||||
@@ -268,14 +131,11 @@ func TestDevice_Delete(t *testing.T) {
|
||||
MaxSimSlots: 4,
|
||||
Status: constants.DeviceStatusInStock,
|
||||
}
|
||||
require.NoError(t, env.db.Create(device).Error)
|
||||
require.NoError(t, env.TX.Create(device).Error)
|
||||
|
||||
t.Run("删除设备-成功", func(t *testing.T) {
|
||||
url := fmt.Sprintf("/api/admin/devices/%d", device.ID)
|
||||
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()
|
||||
|
||||
@@ -286,32 +146,26 @@ func TestDevice_Delete(t *testing.T) {
|
||||
require.NoError(t, err)
|
||||
assert.Equal(t, 0, result.Code)
|
||||
|
||||
// 验证设备已被软删除
|
||||
var deletedDevice model.Device
|
||||
err = env.db.Unscoped().First(&deletedDevice, device.ID).Error
|
||||
err = env.RawDB().Unscoped().First(&deletedDevice, device.ID).Error
|
||||
require.NoError(t, err)
|
||||
assert.NotNil(t, deletedDevice.DeletedAt)
|
||||
})
|
||||
}
|
||||
|
||||
func TestDeviceImport_TaskList(t *testing.T) {
|
||||
env := setupDeviceTestEnv(t)
|
||||
defer env.teardown()
|
||||
env := integ.NewIntegrationTestEnv(t)
|
||||
|
||||
// 创建测试导入任务
|
||||
task := &model.DeviceImportTask{
|
||||
TaskNo: "TEST_DEVICE_IMPORT_001",
|
||||
Status: model.ImportTaskStatusCompleted,
|
||||
BatchNo: "TEST_BATCH_001",
|
||||
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/devices/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/devices/import/tasks?page=1&page_size=20", nil)
|
||||
require.NoError(t, err)
|
||||
defer resp.Body.Close()
|
||||
|
||||
@@ -324,11 +178,8 @@ func TestDeviceImport_TaskList(t *testing.T) {
|
||||
})
|
||||
|
||||
t.Run("获取导入任务详情", func(t *testing.T) {
|
||||
url := fmt.Sprintf("/api/admin/devices/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)
|
||||
url := fmt.Sprintf("/api/admin/devices/import/tasks/%d", task.ID)
|
||||
resp, err := env.AsSuperAdmin().Request("GET", url, nil)
|
||||
require.NoError(t, err)
|
||||
defer resp.Body.Close()
|
||||
|
||||
@@ -342,8 +193,7 @@ func TestDeviceImport_TaskList(t *testing.T) {
|
||||
}
|
||||
|
||||
func TestDevice_GetByIMEI(t *testing.T) {
|
||||
env := setupDeviceTestEnv(t)
|
||||
defer env.teardown()
|
||||
env := integ.NewIntegrationTestEnv(t)
|
||||
|
||||
// 创建测试设备
|
||||
device := &model.Device{
|
||||
@@ -353,14 +203,11 @@ func TestDevice_GetByIMEI(t *testing.T) {
|
||||
MaxSimSlots: 4,
|
||||
Status: constants.DeviceStatusInStock,
|
||||
}
|
||||
require.NoError(t, env.db.Create(device).Error)
|
||||
require.NoError(t, env.TX.Create(device).Error)
|
||||
|
||||
t.Run("通过IMEI查询设备详情-成功", func(t *testing.T) {
|
||||
url := fmt.Sprintf("/api/admin/devices/by-imei/%s", device.DeviceNo)
|
||||
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()
|
||||
|
||||
@@ -379,10 +226,7 @@ func TestDevice_GetByIMEI(t *testing.T) {
|
||||
})
|
||||
|
||||
t.Run("通过不存在的IMEI查询-应返回错误", func(t *testing.T) {
|
||||
req := httptest.NewRequest("GET", "/api/admin/devices/by-imei/NONEXISTENT_IMEI", nil)
|
||||
req.Header.Set("Authorization", "Bearer "+env.adminToken)
|
||||
|
||||
resp, err := env.app.Test(req, -1)
|
||||
resp, err := env.AsSuperAdmin().Request("GET", "/api/admin/devices/by-imei/NONEXISTENT_IMEI", nil)
|
||||
require.NoError(t, err)
|
||||
defer resp.Body.Close()
|
||||
|
||||
@@ -394,9 +238,7 @@ func TestDevice_GetByIMEI(t *testing.T) {
|
||||
|
||||
t.Run("未认证请求-应返回错误", func(t *testing.T) {
|
||||
url := fmt.Sprintf("/api/admin/devices/by-imei/%s", device.DeviceNo)
|
||||
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()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user