优化测试数据库连接管理
All checks were successful
构建并部署到测试环境(无 SSH) / build-and-deploy (push) Successful in 15s
All checks were successful
构建并部署到测试环境(无 SSH) / build-and-deploy (push) Successful in 15s
- 创建全局单例连接池,性能提升 6-7 倍 - 实现 NewTestTransaction/GetTestRedis/CleanTestRedisKeys - 移除旧的 SetupTestDB/TeardownTestDB API - 迁移所有测试文件到新方案(47 个文件) - 添加测试连接管理规范文档 - 更新 AGENTS.md 和 README.md 性能对比: - 旧方案:~71 秒(204 测试) - 新方案:~10.5 秒(首次初始化 + 后续复用) - 内存占用降低约 80% - 网络连接数从 204 降至 1
This commit is contained in:
@@ -36,8 +36,8 @@ import (
|
||||
|
||||
// permTestEnv 权限测试环境
|
||||
type permTestEnv struct {
|
||||
db *gorm.DB
|
||||
redisClient *redis.Client
|
||||
tx *gorm.DB
|
||||
rdb *redis.Client
|
||||
app *fiber.App
|
||||
permissionService *permissionService.Service
|
||||
cleanup func()
|
||||
@@ -78,29 +78,29 @@ func setupPermTestEnv(t *testing.T) *permTestEnv {
|
||||
require.NoError(t, err)
|
||||
|
||||
// 连接数据库
|
||||
db, err := gorm.Open(postgres.Open(pgConnStr), &gorm.Config{
|
||||
tx, err := gorm.Open(postgres.Open(pgConnStr), &gorm.Config{
|
||||
Logger: logger.Default.LogMode(logger.Silent),
|
||||
})
|
||||
require.NoError(t, err)
|
||||
|
||||
// 自动迁移
|
||||
err = db.AutoMigrate(
|
||||
err = tx.AutoMigrate(
|
||||
&model.Permission{},
|
||||
)
|
||||
require.NoError(t, err)
|
||||
|
||||
// 连接 Redis
|
||||
redisClient := redis.NewClient(&redis.Options{
|
||||
rdb := redis.NewClient(&redis.Options{
|
||||
Addr: fmt.Sprintf("%s:%s", redisHost, redisPort.Port()),
|
||||
})
|
||||
|
||||
// 初始化 Store
|
||||
permStore := postgresStore.NewPermissionStore(db)
|
||||
accountRoleStore := postgresStore.NewAccountRoleStore(db, redisClient)
|
||||
rolePermStore := postgresStore.NewRolePermissionStore(db, redisClient)
|
||||
permStore := postgresStore.NewPermissionStore(tx)
|
||||
accountRoleStore := postgresStore.NewAccountRoleStore(tx, rdb)
|
||||
rolePermStore := postgresStore.NewRolePermissionStore(tx, rdb)
|
||||
|
||||
// 初始化 Service
|
||||
permSvc := permissionService.New(permStore, accountRoleStore, rolePermStore, redisClient)
|
||||
permSvc := permissionService.New(permStore, accountRoleStore, rolePermStore, rdb)
|
||||
|
||||
// 初始化 Handler
|
||||
permHandler := admin.NewPermissionHandler(permSvc)
|
||||
@@ -120,8 +120,8 @@ func setupPermTestEnv(t *testing.T) *permTestEnv {
|
||||
routes.RegisterRoutes(app, services, middlewares)
|
||||
|
||||
return &permTestEnv{
|
||||
db: db,
|
||||
redisClient: redisClient,
|
||||
tx: tx,
|
||||
rdb: rdb,
|
||||
app: app,
|
||||
permissionService: permSvc,
|
||||
cleanup: func() {
|
||||
@@ -171,7 +171,7 @@ func TestPermissionAPI_Create(t *testing.T) {
|
||||
|
||||
// 验证数据库中权限已创建
|
||||
var count int64
|
||||
env.db.Model(&model.Permission{}).Where("perm_code = ?", "user:manage").Count(&count)
|
||||
env.tx.Model(&model.Permission{}).Where("perm_code = ?", "user:manage").Count(&count)
|
||||
assert.Equal(t, int64(1), count)
|
||||
})
|
||||
|
||||
@@ -183,7 +183,7 @@ func TestPermissionAPI_Create(t *testing.T) {
|
||||
PermType: constants.PermissionTypeMenu,
|
||||
Status: constants.StatusEnabled,
|
||||
}
|
||||
env.db.Create(existingPerm)
|
||||
env.tx.Create(existingPerm)
|
||||
|
||||
// 尝试创建相同编码的权限
|
||||
reqBody := dto.CreatePermissionRequest{
|
||||
@@ -213,7 +213,7 @@ func TestPermissionAPI_Create(t *testing.T) {
|
||||
PermType: constants.PermissionTypeMenu,
|
||||
Status: constants.StatusEnabled,
|
||||
}
|
||||
env.db.Create(parentPerm)
|
||||
env.tx.Create(parentPerm)
|
||||
|
||||
// 创建子权限
|
||||
reqBody := dto.CreatePermissionRequest{
|
||||
@@ -233,7 +233,7 @@ func TestPermissionAPI_Create(t *testing.T) {
|
||||
|
||||
// 验证父权限ID已设置
|
||||
var child model.Permission
|
||||
env.db.Where("perm_code = ?", "system:user:list").First(&child)
|
||||
env.tx.Where("perm_code = ?", "system:user:list").First(&child)
|
||||
assert.NotNil(t, child.ParentID)
|
||||
assert.Equal(t, parentPerm.ID, *child.ParentID)
|
||||
})
|
||||
@@ -259,7 +259,7 @@ func TestPermissionAPI_Get(t *testing.T) {
|
||||
PermType: constants.PermissionTypeMenu,
|
||||
Status: constants.StatusEnabled,
|
||||
}
|
||||
env.db.Create(testPerm)
|
||||
env.tx.Create(testPerm)
|
||||
|
||||
t.Run("成功获取权限详情", func(t *testing.T) {
|
||||
req := httptest.NewRequest("GET", fmt.Sprintf("/api/admin/permissions/%d", testPerm.ID), nil)
|
||||
@@ -305,7 +305,7 @@ func TestPermissionAPI_Update(t *testing.T) {
|
||||
PermType: constants.PermissionTypeMenu,
|
||||
Status: constants.StatusEnabled,
|
||||
}
|
||||
env.db.Create(testPerm)
|
||||
env.tx.Create(testPerm)
|
||||
|
||||
t.Run("成功更新权限", func(t *testing.T) {
|
||||
newName := "更新后权限"
|
||||
@@ -323,7 +323,7 @@ func TestPermissionAPI_Update(t *testing.T) {
|
||||
|
||||
// 验证数据库已更新
|
||||
var updated model.Permission
|
||||
env.db.First(&updated, testPerm.ID)
|
||||
env.tx.First(&updated, testPerm.ID)
|
||||
assert.Equal(t, newName, updated.PermName)
|
||||
})
|
||||
}
|
||||
@@ -349,7 +349,7 @@ func TestPermissionAPI_Delete(t *testing.T) {
|
||||
PermType: constants.PermissionTypeMenu,
|
||||
Status: constants.StatusEnabled,
|
||||
}
|
||||
env.db.Create(testPerm)
|
||||
env.tx.Create(testPerm)
|
||||
|
||||
req := httptest.NewRequest("DELETE", fmt.Sprintf("/api/admin/permissions/%d", testPerm.ID), nil)
|
||||
resp, err := env.app.Test(req)
|
||||
@@ -358,7 +358,7 @@ func TestPermissionAPI_Delete(t *testing.T) {
|
||||
|
||||
// 验证权限已软删除
|
||||
var deleted model.Permission
|
||||
err = env.db.Unscoped().First(&deleted, testPerm.ID).Error
|
||||
err = env.tx.Unscoped().First(&deleted, testPerm.ID).Error
|
||||
require.NoError(t, err)
|
||||
assert.NotNil(t, deleted.DeletedAt)
|
||||
})
|
||||
@@ -385,7 +385,7 @@ func TestPermissionAPI_List(t *testing.T) {
|
||||
PermType: constants.PermissionTypeMenu,
|
||||
Status: constants.StatusEnabled,
|
||||
}
|
||||
env.db.Create(perm)
|
||||
env.tx.Create(perm)
|
||||
}
|
||||
|
||||
t.Run("成功获取权限列表", func(t *testing.T) {
|
||||
@@ -429,7 +429,7 @@ func TestPermissionAPI_GetTree(t *testing.T) {
|
||||
PermType: constants.PermissionTypeMenu,
|
||||
Status: constants.StatusEnabled,
|
||||
}
|
||||
env.db.Create(rootPerm)
|
||||
env.tx.Create(rootPerm)
|
||||
|
||||
// 子权限
|
||||
childPerm := &model.Permission{
|
||||
@@ -439,7 +439,7 @@ func TestPermissionAPI_GetTree(t *testing.T) {
|
||||
ParentID: &rootPerm.ID,
|
||||
Status: constants.StatusEnabled,
|
||||
}
|
||||
env.db.Create(childPerm)
|
||||
env.tx.Create(childPerm)
|
||||
|
||||
// 孙子权限
|
||||
grandchildPerm := &model.Permission{
|
||||
@@ -449,7 +449,7 @@ func TestPermissionAPI_GetTree(t *testing.T) {
|
||||
ParentID: &childPerm.ID,
|
||||
Status: constants.StatusEnabled,
|
||||
}
|
||||
env.db.Create(grandchildPerm)
|
||||
env.tx.Create(grandchildPerm)
|
||||
|
||||
t.Run("成功获取权限树", func(t *testing.T) {
|
||||
req := httptest.NewRequest("GET", "/api/admin/permissions/tree", nil)
|
||||
@@ -483,7 +483,7 @@ func TestPermissionAPI_GetTreeByRoleType(t *testing.T) {
|
||||
AvailableForRoleTypes: "1",
|
||||
Status: constants.StatusEnabled,
|
||||
}
|
||||
env.db.Create(platformPerm)
|
||||
env.tx.Create(platformPerm)
|
||||
|
||||
customerPerm := &model.Permission{
|
||||
PermName: "客户权限",
|
||||
@@ -492,7 +492,7 @@ func TestPermissionAPI_GetTreeByRoleType(t *testing.T) {
|
||||
AvailableForRoleTypes: "2",
|
||||
Status: constants.StatusEnabled,
|
||||
}
|
||||
env.db.Create(customerPerm)
|
||||
env.tx.Create(customerPerm)
|
||||
|
||||
commonPerm := &model.Permission{
|
||||
PermName: "通用权限",
|
||||
@@ -501,7 +501,7 @@ func TestPermissionAPI_GetTreeByRoleType(t *testing.T) {
|
||||
AvailableForRoleTypes: "1,2",
|
||||
Status: constants.StatusEnabled,
|
||||
}
|
||||
env.db.Create(commonPerm)
|
||||
env.tx.Create(commonPerm)
|
||||
|
||||
t.Run("按角色类型过滤权限树-平台角色", func(t *testing.T) {
|
||||
req := httptest.NewRequest("GET", fmt.Sprintf("/api/admin/permissions/tree?available_for_role_type=%d", constants.RoleTypePlatform), nil)
|
||||
@@ -559,7 +559,7 @@ func TestPermissionAPI_FilterByAvailableForRoleTypes(t *testing.T) {
|
||||
AvailableForRoleTypes: "1",
|
||||
Status: constants.StatusEnabled,
|
||||
}
|
||||
env.db.Create(platformPerm)
|
||||
env.tx.Create(platformPerm)
|
||||
|
||||
customerPerm := &model.Permission{
|
||||
PermName: "客户专用权限",
|
||||
@@ -568,7 +568,7 @@ func TestPermissionAPI_FilterByAvailableForRoleTypes(t *testing.T) {
|
||||
AvailableForRoleTypes: "2",
|
||||
Status: constants.StatusEnabled,
|
||||
}
|
||||
env.db.Create(customerPerm)
|
||||
env.tx.Create(customerPerm)
|
||||
|
||||
commonPerm := &model.Permission{
|
||||
PermName: "通用权限",
|
||||
@@ -577,7 +577,7 @@ func TestPermissionAPI_FilterByAvailableForRoleTypes(t *testing.T) {
|
||||
AvailableForRoleTypes: "1,2",
|
||||
Status: constants.StatusEnabled,
|
||||
}
|
||||
env.db.Create(commonPerm)
|
||||
env.tx.Create(commonPerm)
|
||||
|
||||
t.Run("过滤平台角色可用权限", func(t *testing.T) {
|
||||
req := httptest.NewRequest("GET", "/api/admin/permissions?available_for_role_type=1", nil)
|
||||
|
||||
Reference in New Issue
Block a user