oadmin/sub2api
1
0
Fork 0
Code Issues Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

fix(仓储): 修复软删除过滤与事务测试

Browse Source 
修复软删除拦截器使用错误，确保默认查询过滤已删记录
仓储层改用 ent.Tx 与扫描辅助，避免 sql.Tx 断言问题
同步更新集成测试以覆盖事务与统计变动
This commit is contained in:
yangjianbo
2025-12-29 19:23:49 +08:00
parent b436da7249
commit ae191f72a4
20 changed files with 565 additions and 326 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
backend/internal/repository/allowed_groups_contract_integration_test.go
View File

@@ -20,7 +20,8 @@ func uniqueTestValue(t *testing.T, prefix string) string {
func TestUserRepository_RemoveGroupFromAllowedGroups_RemovesAllOccurrences(t *testing.T) {
ctx := context.Background()
entClient, sqlTx := testEntSQLTx(t)
tx := testEntTx(t)
entClient := tx.Client()
targetGroup, err := entClient.Group.Create().
SetName(uniqueTestValue(t, "target-group")).
@@ -33,7 +34,7 @@ func TestUserRepository_RemoveGroupFromAllowedGroups_RemovesAllOccurrences(t *te
Save(ctx)
require.NoError(t, err)
repo := newUserRepositoryWithSQL(entClient, sqlTx)
repo := newUserRepositoryWithSQL(entClient, tx)
u1 := &service.User{
Email: uniqueTestValue(t, "u1") + "@example.com",
@@ -81,7 +82,8 @@ func TestUserRepository_RemoveGroupFromAllowedGroups_RemovesAllOccurrences(t *te
func TestGroupRepository_DeleteCascade_RemovesAllowedGroupsAndClearsApiKeys(t *testing.T) {
ctx := context.Background()
entClient, sqlTx := testEntSQLTx(t)
tx := testEntTx(t)
entClient := tx.Client()
targetGroup, err := entClient.Group.Create().
SetName(uniqueTestValue(t, "delete-cascade-target")).
@@ -94,8 +96,8 @@ func TestGroupRepository_DeleteCascade_RemovesAllowedGroupsAndClearsApiKeys(t *t
Save(ctx)
require.NoError(t, err)
userRepo := newUserRepositoryWithSQL(entClient, sqlTx)
groupRepo := newGroupRepositoryWithSQL(entClient, sqlTx)
userRepo := newUserRepositoryWithSQL(entClient, tx)
groupRepo := newGroupRepositoryWithSQL(entClient, tx)
apiKeyRepo := NewApiKeyRepository(entClient)
u := &service.User{
@@ -141,4 +143,3 @@ func TestGroupRepository_DeleteCascade_RemovesAllowedGroupsAndClearsApiKeys(t *t
require.NoError(t, err)
require.Nil(t, keyAfter.GroupID)
}