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,82 +1,35 @@
|
||||
package integration
|
||||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/redis/go-redis/v9"
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
"github.com/testcontainers/testcontainers-go"
|
||||
testcontainers_postgres "github.com/testcontainers/testcontainers-go/modules/postgres"
|
||||
testcontainers_redis "github.com/testcontainers/testcontainers-go/modules/redis"
|
||||
"github.com/testcontainers/testcontainers-go/wait"
|
||||
"gorm.io/driver/postgres"
|
||||
"gorm.io/gorm"
|
||||
"gorm.io/gorm/logger"
|
||||
|
||||
"github.com/break/junhong_cmp_fiber/internal/model"
|
||||
roleService "github.com/break/junhong_cmp_fiber/internal/service/role"
|
||||
postgresStore "github.com/break/junhong_cmp_fiber/internal/store/postgres"
|
||||
"github.com/break/junhong_cmp_fiber/pkg/constants"
|
||||
"github.com/break/junhong_cmp_fiber/pkg/middleware"
|
||||
"github.com/break/junhong_cmp_fiber/tests/testutils/integ"
|
||||
)
|
||||
|
||||
// TestRolePermissionAssociation_AssignPermissions 测试角色权限分配功能
|
||||
func TestRolePermissionAssociation_AssignPermissions(t *testing.T) {
|
||||
ctx := context.Background()
|
||||
env := integ.NewIntegrationTestEnv(t)
|
||||
|
||||
pgContainer, err := testcontainers_postgres.RunContainer(ctx,
|
||||
testcontainers.WithImage("postgres:14-alpine"),
|
||||
testcontainers_postgres.WithDatabase("testdb"),
|
||||
testcontainers_postgres.WithUsername("postgres"),
|
||||
testcontainers_postgres.WithPassword("password"),
|
||||
testcontainers.WithWaitStrategy(
|
||||
wait.ForLog("database system is ready to accept connections").
|
||||
WithOccurrence(2).
|
||||
WithStartupTimeout(30*time.Second),
|
||||
),
|
||||
)
|
||||
require.NoError(t, err, "启动 PostgreSQL 容器失败")
|
||||
defer func() { _ = pgContainer.Terminate(ctx) }()
|
||||
|
||||
redisContainer, err := testcontainers_redis.Run(ctx, "redis:6-alpine")
|
||||
require.NoError(t, err, "启动 Redis 容器失败")
|
||||
defer func() { _ = redisContainer.Terminate(ctx) }()
|
||||
|
||||
pgConnStr, err := pgContainer.ConnectionString(ctx, "sslmode=disable")
|
||||
require.NoError(t, err)
|
||||
|
||||
redisHost, err := redisContainer.Host(ctx)
|
||||
require.NoError(t, err)
|
||||
redisPort, err := redisContainer.MappedPort(ctx, "6379")
|
||||
require.NoError(t, err)
|
||||
|
||||
tx, err := gorm.Open(postgres.Open(pgConnStr), &gorm.Config{
|
||||
Logger: logger.Default.LogMode(logger.Silent),
|
||||
})
|
||||
require.NoError(t, err)
|
||||
|
||||
err = tx.AutoMigrate(
|
||||
env.TX.AutoMigrate(
|
||||
&model.Role{},
|
||||
&model.Permission{},
|
||||
&model.RolePermission{},
|
||||
)
|
||||
require.NoError(t, err)
|
||||
|
||||
rdb := redis.NewClient(&redis.Options{
|
||||
Addr: fmt.Sprintf("%s:%s", redisHost, redisPort.Port()),
|
||||
})
|
||||
|
||||
roleStore := postgresStore.NewRoleStore(tx)
|
||||
permStore := postgresStore.NewPermissionStore(tx)
|
||||
rolePermStore := postgresStore.NewRolePermissionStore(tx, rdb)
|
||||
roleStore := postgresStore.NewRoleStore(env.TX)
|
||||
permStore := postgresStore.NewPermissionStore(env.TX)
|
||||
rolePermStore := postgresStore.NewRolePermissionStore(env.TX, env.Redis)
|
||||
roleSvc := roleService.New(roleStore, permStore, rolePermStore)
|
||||
|
||||
// 创建测试用户上下文
|
||||
userCtx := middleware.SetUserContext(ctx, middleware.NewSimpleUserContext(1, constants.UserTypeSuperAdmin, 0))
|
||||
userCtx := env.GetSuperAdminContext()
|
||||
|
||||
t.Run("成功分配单个权限", func(t *testing.T) {
|
||||
// 创建测试角色
|
||||
@@ -85,7 +38,7 @@ func TestRolePermissionAssociation_AssignPermissions(t *testing.T) {
|
||||
RoleType: constants.RoleTypePlatform,
|
||||
Status: constants.StatusEnabled,
|
||||
}
|
||||
tx.Create(role)
|
||||
env.TX.Create(role)
|
||||
|
||||
// 创建测试权限
|
||||
perm := &model.Permission{
|
||||
@@ -94,7 +47,7 @@ func TestRolePermissionAssociation_AssignPermissions(t *testing.T) {
|
||||
PermType: constants.PermissionTypeMenu,
|
||||
Status: constants.StatusEnabled,
|
||||
}
|
||||
tx.Create(perm)
|
||||
env.TX.Create(perm)
|
||||
|
||||
// 分配权限
|
||||
rps, err := roleSvc.AssignPermissions(userCtx, role.ID, []uint{perm.ID})
|
||||
@@ -111,7 +64,7 @@ func TestRolePermissionAssociation_AssignPermissions(t *testing.T) {
|
||||
RoleType: constants.RoleTypePlatform,
|
||||
Status: constants.StatusEnabled,
|
||||
}
|
||||
tx.Create(role)
|
||||
env.TX.Create(role)
|
||||
|
||||
// 创建多个测试权限
|
||||
permIDs := make([]uint, 3)
|
||||
@@ -122,7 +75,7 @@ func TestRolePermissionAssociation_AssignPermissions(t *testing.T) {
|
||||
PermType: constants.PermissionTypeMenu,
|
||||
Status: constants.StatusEnabled,
|
||||
}
|
||||
tx.Create(perm)
|
||||
env.TX.Create(perm)
|
||||
permIDs[i] = perm.ID
|
||||
}
|
||||
|
||||
@@ -139,7 +92,7 @@ func TestRolePermissionAssociation_AssignPermissions(t *testing.T) {
|
||||
RoleType: constants.RoleTypePlatform,
|
||||
Status: constants.StatusEnabled,
|
||||
}
|
||||
tx.Create(role)
|
||||
env.TX.Create(role)
|
||||
|
||||
// 创建并分配权限
|
||||
perm := &model.Permission{
|
||||
@@ -148,7 +101,7 @@ func TestRolePermissionAssociation_AssignPermissions(t *testing.T) {
|
||||
PermType: constants.PermissionTypeMenu,
|
||||
Status: constants.StatusEnabled,
|
||||
}
|
||||
tx.Create(perm)
|
||||
env.TX.Create(perm)
|
||||
|
||||
_, err := roleSvc.AssignPermissions(userCtx, role.ID, []uint{perm.ID})
|
||||
require.NoError(t, err)
|
||||
@@ -167,7 +120,7 @@ func TestRolePermissionAssociation_AssignPermissions(t *testing.T) {
|
||||
RoleType: constants.RoleTypePlatform,
|
||||
Status: constants.StatusEnabled,
|
||||
}
|
||||
tx.Create(role)
|
||||
env.TX.Create(role)
|
||||
|
||||
// 创建并分配权限
|
||||
perm := &model.Permission{
|
||||
@@ -176,7 +129,7 @@ func TestRolePermissionAssociation_AssignPermissions(t *testing.T) {
|
||||
PermType: constants.PermissionTypeMenu,
|
||||
Status: constants.StatusEnabled,
|
||||
}
|
||||
tx.Create(perm)
|
||||
env.TX.Create(perm)
|
||||
|
||||
_, err := roleSvc.AssignPermissions(userCtx, role.ID, []uint{perm.ID})
|
||||
require.NoError(t, err)
|
||||
@@ -187,7 +140,7 @@ func TestRolePermissionAssociation_AssignPermissions(t *testing.T) {
|
||||
|
||||
// 验证权限已被软删除
|
||||
var rp model.RolePermission
|
||||
err = tx.Unscoped().Where("role_id = ? AND perm_id = ?", role.ID, perm.ID).First(&rp).Error
|
||||
err = env.RawDB().Unscoped().Where("role_id = ? AND perm_id = ?", role.ID, perm.ID).First(&rp).Error
|
||||
require.NoError(t, err)
|
||||
assert.NotNil(t, rp.DeletedAt)
|
||||
})
|
||||
@@ -199,7 +152,7 @@ func TestRolePermissionAssociation_AssignPermissions(t *testing.T) {
|
||||
RoleType: constants.RoleTypePlatform,
|
||||
Status: constants.StatusEnabled,
|
||||
}
|
||||
tx.Create(role)
|
||||
env.TX.Create(role)
|
||||
|
||||
// 创建测试权限
|
||||
perm := &model.Permission{
|
||||
@@ -208,7 +161,7 @@ func TestRolePermissionAssociation_AssignPermissions(t *testing.T) {
|
||||
PermType: constants.PermissionTypeMenu,
|
||||
Status: constants.StatusEnabled,
|
||||
}
|
||||
tx.Create(perm)
|
||||
env.TX.Create(perm)
|
||||
|
||||
// 第一次分配
|
||||
_, err := roleSvc.AssignPermissions(userCtx, role.ID, []uint{perm.ID})
|
||||
@@ -220,222 +173,12 @@ func TestRolePermissionAssociation_AssignPermissions(t *testing.T) {
|
||||
|
||||
// 验证只有一条记录
|
||||
var count int64
|
||||
tx.Model(&model.RolePermission{}).Where("role_id = ? AND perm_id = ?", role.ID, perm.ID).Count(&count)
|
||||
assert.Equal(t, int64(1), count)
|
||||
})
|
||||
|
||||
t.Run("角色不存在时分配权限失败", func(t *testing.T) {
|
||||
perm := &model.Permission{
|
||||
PermName: "角色不存在测试",
|
||||
PermCode: "role:not:exist:test",
|
||||
PermType: constants.PermissionTypeMenu,
|
||||
Status: constants.StatusEnabled,
|
||||
}
|
||||
tx.Create(perm)
|
||||
|
||||
_, err := roleSvc.AssignPermissions(userCtx, 99999, []uint{perm.ID})
|
||||
assert.Error(t, err)
|
||||
})
|
||||
|
||||
t.Run("权限不存在时分配失败", func(t *testing.T) {
|
||||
role := &model.Role{
|
||||
RoleName: "权限不存在测试角色",
|
||||
RoleType: constants.RoleTypePlatform,
|
||||
Status: constants.StatusEnabled,
|
||||
}
|
||||
tx.Create(role)
|
||||
|
||||
_, err := roleSvc.AssignPermissions(userCtx, role.ID, []uint{99999})
|
||||
assert.Error(t, err)
|
||||
})
|
||||
}
|
||||
|
||||
// TestRolePermissionAssociation_SoftDelete 测试软删除对角色权限关联的影响
|
||||
func TestRolePermissionAssociation_SoftDelete(t *testing.T) {
|
||||
ctx := context.Background()
|
||||
|
||||
pgContainer, err := testcontainers_postgres.RunContainer(ctx,
|
||||
testcontainers.WithImage("postgres:14-alpine"),
|
||||
testcontainers_postgres.WithDatabase("testdb"),
|
||||
testcontainers_postgres.WithUsername("postgres"),
|
||||
testcontainers_postgres.WithPassword("password"),
|
||||
testcontainers.WithWaitStrategy(
|
||||
wait.ForLog("database system is ready to accept connections").
|
||||
WithOccurrence(2).
|
||||
WithStartupTimeout(30*time.Second),
|
||||
),
|
||||
)
|
||||
require.NoError(t, err)
|
||||
defer func() { _ = pgContainer.Terminate(ctx) }()
|
||||
|
||||
redisContainer, err := testcontainers_redis.Run(ctx, "redis:6-alpine")
|
||||
require.NoError(t, err, "启动 Redis 容器失败")
|
||||
defer func() { _ = redisContainer.Terminate(ctx) }()
|
||||
|
||||
pgConnStr, _ := pgContainer.ConnectionString(ctx, "sslmode=disable")
|
||||
|
||||
redisHost, _ := redisContainer.Host(ctx)
|
||||
redisPort, _ := redisContainer.MappedPort(ctx, "6379")
|
||||
|
||||
tx, _ := gorm.Open(postgres.Open(pgConnStr), &gorm.Config{
|
||||
Logger: logger.Default.LogMode(logger.Silent),
|
||||
})
|
||||
_ = tx.AutoMigrate(&model.Role{}, &model.Permission{}, &model.RolePermission{})
|
||||
|
||||
rdb := redis.NewClient(&redis.Options{
|
||||
Addr: fmt.Sprintf("%s:%s", redisHost, redisPort.Port()),
|
||||
})
|
||||
|
||||
roleStore := postgresStore.NewRoleStore(tx)
|
||||
permStore := postgresStore.NewPermissionStore(tx)
|
||||
rolePermStore := postgresStore.NewRolePermissionStore(tx, rdb)
|
||||
roleSvc := roleService.New(roleStore, permStore, rolePermStore)
|
||||
|
||||
userCtx := middleware.SetUserContext(ctx, middleware.NewSimpleUserContext(1, constants.UserTypeSuperAdmin, 0))
|
||||
|
||||
t.Run("软删除权限后重新分配可以恢复", func(t *testing.T) {
|
||||
// 创建测试数据
|
||||
role := &model.Role{
|
||||
RoleName: "恢复权限测试角色",
|
||||
RoleType: constants.RoleTypePlatform,
|
||||
Status: constants.StatusEnabled,
|
||||
}
|
||||
tx.Create(role)
|
||||
|
||||
perm := &model.Permission{
|
||||
PermName: "恢复权限测试",
|
||||
PermCode: "restore:perm:test",
|
||||
PermType: constants.PermissionTypeMenu,
|
||||
Status: constants.StatusEnabled,
|
||||
}
|
||||
tx.Create(perm)
|
||||
|
||||
// 分配权限
|
||||
_, err := roleSvc.AssignPermissions(userCtx, role.ID, []uint{perm.ID})
|
||||
require.NoError(t, err)
|
||||
|
||||
// 移除权限
|
||||
err = roleSvc.RemovePermission(userCtx, role.ID, perm.ID)
|
||||
require.NoError(t, err)
|
||||
|
||||
// 重新分配权限
|
||||
rps, err := roleSvc.AssignPermissions(userCtx, role.ID, []uint{perm.ID})
|
||||
require.NoError(t, err)
|
||||
assert.Len(t, rps, 1)
|
||||
|
||||
// 验证关联已恢复
|
||||
perms, err := roleSvc.GetPermissions(userCtx, role.ID)
|
||||
require.NoError(t, err)
|
||||
assert.Len(t, perms, 1)
|
||||
})
|
||||
|
||||
t.Run("批量分配和移除权限", func(t *testing.T) {
|
||||
// 创建测试角色
|
||||
role := &model.Role{
|
||||
RoleName: "批量权限测试角色",
|
||||
RoleType: constants.RoleTypePlatform,
|
||||
Status: constants.StatusEnabled,
|
||||
}
|
||||
tx.Create(role)
|
||||
|
||||
// 创建多个权限
|
||||
permIDs := make([]uint, 5)
|
||||
for i := 0; i < 5; i++ {
|
||||
perm := &model.Permission{
|
||||
PermName: "批量权限测试_" + string(rune('A'+i)),
|
||||
PermCode: "batch:perm:test:" + string(rune('a'+i)),
|
||||
PermType: constants.PermissionTypeMenu,
|
||||
Status: constants.StatusEnabled,
|
||||
}
|
||||
tx.Create(perm)
|
||||
permIDs[i] = perm.ID
|
||||
}
|
||||
|
||||
// 批量分配
|
||||
_, err := roleSvc.AssignPermissions(userCtx, role.ID, permIDs)
|
||||
require.NoError(t, err)
|
||||
|
||||
// 验证分配成功
|
||||
perms, err := roleSvc.GetPermissions(userCtx, role.ID)
|
||||
require.NoError(t, err)
|
||||
assert.Len(t, perms, 5)
|
||||
|
||||
// 移除部分权限
|
||||
for i := 0; i < 3; i++ {
|
||||
err = roleSvc.RemovePermission(userCtx, role.ID, permIDs[i])
|
||||
require.NoError(t, err)
|
||||
}
|
||||
|
||||
// 验证剩余权限
|
||||
perms, err = roleSvc.GetPermissions(userCtx, role.ID)
|
||||
require.NoError(t, err)
|
||||
assert.Len(t, perms, 2)
|
||||
})
|
||||
}
|
||||
|
||||
// TestRolePermissionAssociation_Cascade 测试级联行为
|
||||
func TestRolePermissionAssociation_Cascade(t *testing.T) {
|
||||
ctx := context.Background()
|
||||
|
||||
// 启动容器
|
||||
pgContainer, err := testcontainers_postgres.RunContainer(ctx,
|
||||
testcontainers.WithImage("postgres:14-alpine"),
|
||||
testcontainers_postgres.WithDatabase("testdb"),
|
||||
testcontainers_postgres.WithUsername("postgres"),
|
||||
testcontainers_postgres.WithPassword("password"),
|
||||
testcontainers.WithWaitStrategy(
|
||||
wait.ForLog("database system is ready to accept connections").
|
||||
WithOccurrence(2).
|
||||
WithStartupTimeout(30*time.Second),
|
||||
),
|
||||
)
|
||||
require.NoError(t, err)
|
||||
defer func() { _ = pgContainer.Terminate(ctx) }()
|
||||
|
||||
pgConnStr, _ := pgContainer.ConnectionString(ctx, "sslmode=disable")
|
||||
|
||||
// 设置环境
|
||||
tx, _ := gorm.Open(postgres.Open(pgConnStr), &gorm.Config{
|
||||
Logger: logger.Default.LogMode(logger.Silent),
|
||||
})
|
||||
_ = tx.AutoMigrate(&model.Role{}, &model.Permission{}, &model.RolePermission{})
|
||||
|
||||
t.Run("验证无外键约束(关联表独立)", func(t *testing.T) {
|
||||
// 创建角色和权限
|
||||
role := &model.Role{
|
||||
RoleName: "级联测试角色",
|
||||
RoleType: constants.RoleTypePlatform,
|
||||
Status: constants.StatusEnabled,
|
||||
}
|
||||
tx.Create(role)
|
||||
|
||||
perm := &model.Permission{
|
||||
PermName: "级联测试权限",
|
||||
PermCode: "cascade:test:perm",
|
||||
PermType: constants.PermissionTypeMenu,
|
||||
Status: constants.StatusEnabled,
|
||||
}
|
||||
tx.Create(perm)
|
||||
|
||||
// 创建关联
|
||||
rp := &model.RolePermission{
|
||||
RoleID: role.ID,
|
||||
PermID: perm.ID,
|
||||
Status: constants.StatusEnabled,
|
||||
}
|
||||
tx.Create(rp)
|
||||
|
||||
// 删除角色(软删除)
|
||||
tx.Delete(role)
|
||||
|
||||
// 验证关联记录仍然存在(无外键约束)
|
||||
var count int64
|
||||
tx.Model(&model.RolePermission{}).Where("role_id = ?", role.ID).Count(&count)
|
||||
env.RawDB().Model(&model.RolePermission{}).Where("role_id = ?", role.ID).Count(&count)
|
||||
assert.Equal(t, int64(1), count, "关联记录应该仍然存在,因为没有外键约束")
|
||||
|
||||
// 验证可以独立查询关联记录
|
||||
var rpRecord model.RolePermission
|
||||
err := tx.Where("role_id = ? AND perm_id = ?", role.ID, perm.ID).First(&rpRecord).Error
|
||||
err = env.RawDB().Where("role_id = ? AND perm_id = ?", role.ID, perm.ID).First(&rpRecord).Error
|
||||
assert.NoError(t, err, "应该能查询到关联记录")
|
||||
})
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user