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
主要变更: - 实现设备管理模块(创建、查询、列表、更新状态、删除) - 实现设备批量导入功能(CSV 解析、ICCID 绑定、异步任务处理) - 添加设备-SIM 卡绑定约束(部分唯一索引防止并发问题) - 修复 fee_rate 数据库字段类型(numeric -> bigint) - 修复测试数据隔离问题(基于增量断言) - 修复集成测试中间件顺序问题 - 清理无用测试文件(PersonalCustomer、Email 相关) - 归档 enterprise-card-authorization 变更
This commit is contained in:
@@ -17,6 +17,7 @@ import (
|
||||
testcontainers_postgres "github.com/testcontainers/testcontainers-go/modules/postgres"
|
||||
testcontainers_redis "github.com/testcontainers/testcontainers-go/modules/redis"
|
||||
"github.com/testcontainers/testcontainers-go/wait"
|
||||
"go.uber.org/zap"
|
||||
"gorm.io/driver/postgres"
|
||||
"gorm.io/gorm"
|
||||
"gorm.io/gorm/logger"
|
||||
@@ -37,7 +38,7 @@ import (
|
||||
// permTestEnv 权限测试环境
|
||||
type permTestEnv struct {
|
||||
tx *gorm.DB
|
||||
rdb *redis.Client
|
||||
rdb *redis.Client
|
||||
app *fiber.App
|
||||
permissionService *permissionService.Service
|
||||
cleanup func()
|
||||
@@ -105,23 +106,28 @@ func setupPermTestEnv(t *testing.T) *permTestEnv {
|
||||
// 初始化 Handler
|
||||
permHandler := admin.NewPermissionHandler(permSvc)
|
||||
|
||||
// 创建 Fiber App
|
||||
app := fiber.New(fiber.Config{
|
||||
ErrorHandler: func(c *fiber.Ctx, err error) error {
|
||||
return c.Status(fiber.StatusInternalServerError).JSON(fiber.Map{"error": err.Error()})
|
||||
},
|
||||
ErrorHandler: errors.SafeErrorHandler(zap.NewNop()),
|
||||
})
|
||||
|
||||
app.Use(func(c *fiber.Ctx) error {
|
||||
ctx := middleware.SetUserContext(c.UserContext(), middleware.NewSimpleUserContext(1, constants.UserTypeSuperAdmin, 0))
|
||||
c.SetUserContext(ctx)
|
||||
return c.Next()
|
||||
})
|
||||
|
||||
// 注册路由
|
||||
services := &bootstrap.Handlers{
|
||||
Permission: permHandler,
|
||||
}
|
||||
middlewares := &bootstrap.Middlewares{}
|
||||
middlewares := &bootstrap.Middlewares{
|
||||
AdminAuth: func(c *fiber.Ctx) error { return c.Next() },
|
||||
H5Auth: func(c *fiber.Ctx) error { return c.Next() },
|
||||
}
|
||||
routes.RegisterRoutes(app, services, middlewares)
|
||||
|
||||
return &permTestEnv{
|
||||
tx: tx,
|
||||
rdb: rdb,
|
||||
rdb: rdb,
|
||||
app: app,
|
||||
permissionService: permSvc,
|
||||
cleanup: func() {
|
||||
@@ -140,14 +146,6 @@ func TestPermissionAPI_Create(t *testing.T) {
|
||||
env := setupPermTestEnv(t)
|
||||
defer env.cleanup()
|
||||
|
||||
// 添加测试中间件
|
||||
testUserID := uint(1)
|
||||
env.app.Use(func(c *fiber.Ctx) error {
|
||||
ctx := middleware.SetUserContext(c.UserContext(), middleware.NewSimpleUserContext(testUserID, constants.UserTypeSuperAdmin, 0))
|
||||
c.SetUserContext(ctx)
|
||||
return c.Next()
|
||||
})
|
||||
|
||||
t.Run("成功创建权限", func(t *testing.T) {
|
||||
reqBody := dto.CreatePermissionRequest{
|
||||
PermName: "用户管理",
|
||||
@@ -206,7 +204,6 @@ func TestPermissionAPI_Create(t *testing.T) {
|
||||
})
|
||||
|
||||
t.Run("创建子权限", func(t *testing.T) {
|
||||
// 先创建父权限
|
||||
parentPerm := &model.Permission{
|
||||
PermName: "系统管理",
|
||||
PermCode: "system:manage",
|
||||
@@ -215,10 +212,9 @@ func TestPermissionAPI_Create(t *testing.T) {
|
||||
}
|
||||
env.tx.Create(parentPerm)
|
||||
|
||||
// 创建子权限
|
||||
reqBody := dto.CreatePermissionRequest{
|
||||
PermName: "用户列表",
|
||||
PermCode: "system:user:list",
|
||||
PermCode: "user:list",
|
||||
PermType: constants.PermissionTypeButton,
|
||||
ParentID: &parentPerm.ID,
|
||||
}
|
||||
@@ -231,10 +227,10 @@ func TestPermissionAPI_Create(t *testing.T) {
|
||||
require.NoError(t, err)
|
||||
assert.Equal(t, fiber.StatusOK, resp.StatusCode)
|
||||
|
||||
// 验证父权限ID已设置
|
||||
var child model.Permission
|
||||
env.tx.Where("perm_code = ?", "system:user:list").First(&child)
|
||||
assert.NotNil(t, child.ParentID)
|
||||
err = env.tx.Where("perm_code = ?", "user:list").First(&child).Error
|
||||
require.NoError(t, err, "子权限应该已创建")
|
||||
require.NotNil(t, child.ParentID, "子权限的 ParentID 应该已设置")
|
||||
assert.Equal(t, parentPerm.ID, *child.ParentID)
|
||||
})
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user