用户软删除后使用记录仍在,但身份(邮箱)被 ent 软删除拦截器隐藏。本次在 三条管理员只读路径定点穿透软删除过滤,并把删除状态传播到前端标记,零新表/ 迁移/回填: - 后端穿透:富化 usage 日志(loadUsers)、用户搜索(ListWithFilters + UserListFilters.IncludeDeleted)、点击详情(GetByIDIncludeDeleted / GetUserIncludeDeleted + getById ?include_deleted 分支) - 状态传播:service.User / dto.User 新增 DeletedAt;SearchUsers 标记 deleted - 前端:表格与余额弹窗展示"已删除"徽标、筛选下拉标注并排序、点击走 include_deleted;新增 i18n admin.usage.userDeletedBadge - 安全:普通用户 usage 仅查本人(无 PII 泄漏);主用户列表与默认 getById 行为不变(已删用户仍 404);仅 admin 搜索设 IncludeDeleted 后端 build / 三态 vet / unit 全量 / 仓储集成全绿;前端 typecheck / vitest / 改动文件 eslint 全清。 Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
198 lines
5.8 KiB
Go
198 lines
5.8 KiB
Go
//go:build unit
|
|
|
|
package service
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/Wei-Shaw/sub2api/internal/pkg/pagination"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
type ensureEmailCall struct {
|
|
userID int64
|
|
email string
|
|
}
|
|
|
|
type replaceEmailCall struct {
|
|
userID int64
|
|
oldEmail string
|
|
newEmail string
|
|
}
|
|
|
|
type emailSyncRepoStub struct {
|
|
user *User
|
|
nextID int64
|
|
updateCalls int
|
|
created []*User
|
|
updated []*User
|
|
ensureCalls []ensureEmailCall
|
|
replaceCalls []replaceEmailCall
|
|
ensureErr error
|
|
replaceErr error
|
|
}
|
|
|
|
func (s *emailSyncRepoStub) Create(_ context.Context, user *User) error {
|
|
if s.nextID != 0 && user.ID == 0 {
|
|
user.ID = s.nextID
|
|
}
|
|
s.created = append(s.created, user)
|
|
s.user = user
|
|
return nil
|
|
}
|
|
|
|
func (s *emailSyncRepoStub) GetByID(_ context.Context, _ int64) (*User, error) {
|
|
if s.user == nil {
|
|
return nil, ErrUserNotFound
|
|
}
|
|
cloned := *s.user
|
|
return &cloned, nil
|
|
}
|
|
|
|
func (s *emailSyncRepoStub) GetByEmail(_ context.Context, _ string) (*User, error) {
|
|
return nil, ErrUserNotFound
|
|
}
|
|
|
|
func (s *emailSyncRepoStub) GetFirstAdmin(context.Context) (*User, error) {
|
|
return nil, fmt.Errorf("unexpected GetFirstAdmin call")
|
|
}
|
|
|
|
func (s *emailSyncRepoStub) Update(_ context.Context, user *User) error {
|
|
s.updateCalls++
|
|
s.updated = append(s.updated, user)
|
|
s.user = user
|
|
return nil
|
|
}
|
|
|
|
func (s *emailSyncRepoStub) Delete(context.Context, int64) error { return nil }
|
|
|
|
func (s *emailSyncRepoStub) GetUserAvatar(context.Context, int64) (*UserAvatar, error) {
|
|
return nil, fmt.Errorf("unexpected GetUserAvatar call")
|
|
}
|
|
|
|
func (s *emailSyncRepoStub) UpsertUserAvatar(context.Context, int64, UpsertUserAvatarInput) (*UserAvatar, error) {
|
|
return nil, fmt.Errorf("unexpected UpsertUserAvatar call")
|
|
}
|
|
|
|
func (s *emailSyncRepoStub) DeleteUserAvatar(context.Context, int64) error {
|
|
return fmt.Errorf("unexpected DeleteUserAvatar call")
|
|
}
|
|
|
|
func (s *emailSyncRepoStub) List(context.Context, pagination.PaginationParams) ([]User, *pagination.PaginationResult, error) {
|
|
return nil, nil, fmt.Errorf("unexpected List call")
|
|
}
|
|
|
|
func (s *emailSyncRepoStub) ListWithFilters(context.Context, pagination.PaginationParams, UserListFilters) ([]User, *pagination.PaginationResult, error) {
|
|
return nil, nil, fmt.Errorf("unexpected ListWithFilters call")
|
|
}
|
|
|
|
func (s *emailSyncRepoStub) GetLatestUsedAtByUserIDs(context.Context, []int64) (map[int64]*time.Time, error) {
|
|
return map[int64]*time.Time{}, nil
|
|
}
|
|
|
|
func (s *emailSyncRepoStub) GetLatestUsedAtByUserID(context.Context, int64) (*time.Time, error) {
|
|
return nil, nil
|
|
}
|
|
|
|
func (s *emailSyncRepoStub) UpdateUserLastActiveAt(context.Context, int64, time.Time) error {
|
|
return nil
|
|
}
|
|
|
|
func (s *emailSyncRepoStub) UpdateBalance(context.Context, int64, float64) error { return nil }
|
|
|
|
func (s *emailSyncRepoStub) DeductBalance(context.Context, int64, float64) error { return nil }
|
|
|
|
func (s *emailSyncRepoStub) UpdateConcurrency(context.Context, int64, int) error { return nil }
|
|
|
|
func (s *emailSyncRepoStub) ExistsByEmail(context.Context, string) (bool, error) { return false, nil }
|
|
|
|
func (s *emailSyncRepoStub) RemoveGroupFromAllowedGroups(context.Context, int64) (int64, error) {
|
|
return 0, nil
|
|
}
|
|
|
|
func (s *emailSyncRepoStub) BatchSetConcurrency(context.Context, []int64, int) (int, error) {
|
|
return 0, nil
|
|
}
|
|
func (s *emailSyncRepoStub) BatchAddConcurrency(context.Context, []int64, int) (int, error) {
|
|
return 0, nil
|
|
}
|
|
|
|
func (s *emailSyncRepoStub) AddGroupToAllowedGroups(context.Context, int64, int64) error { return nil }
|
|
|
|
func (s *emailSyncRepoStub) RemoveGroupFromUserAllowedGroups(context.Context, int64, int64) error {
|
|
return nil
|
|
}
|
|
|
|
func (s *emailSyncRepoStub) ListUserAuthIdentities(context.Context, int64) ([]UserAuthIdentityRecord, error) {
|
|
return nil, nil
|
|
}
|
|
|
|
func (s *emailSyncRepoStub) UnbindUserAuthProvider(context.Context, int64, string) error { return nil }
|
|
|
|
func (s *emailSyncRepoStub) UpdateTotpSecret(context.Context, int64, *string) error { return nil }
|
|
|
|
func (s *emailSyncRepoStub) EnableTotp(context.Context, int64) error { return nil }
|
|
|
|
func (s *emailSyncRepoStub) DisableTotp(context.Context, int64) error { return nil }
|
|
func (s *emailSyncRepoStub) GetByIDIncludeDeleted(ctx context.Context, id int64) (*User, error) {
|
|
return s.GetByID(ctx, id)
|
|
}
|
|
|
|
func (s *emailSyncRepoStub) EnsureEmailAuthIdentity(_ context.Context, userID int64, email string) error {
|
|
s.ensureCalls = append(s.ensureCalls, ensureEmailCall{userID: userID, email: email})
|
|
return s.ensureErr
|
|
}
|
|
|
|
func (s *emailSyncRepoStub) ReplaceEmailAuthIdentity(_ context.Context, userID int64, oldEmail, newEmail string) error {
|
|
s.replaceCalls = append(s.replaceCalls, replaceEmailCall{
|
|
userID: userID,
|
|
oldEmail: oldEmail,
|
|
newEmail: newEmail,
|
|
})
|
|
return s.replaceErr
|
|
}
|
|
|
|
func TestAdminService_CreateUser_DoesNotReturnPartialSuccessFromEmailIdentityResync(t *testing.T) {
|
|
repo := &emailSyncRepoStub{
|
|
nextID: 55,
|
|
ensureErr: fmt.Errorf("unexpected email resync"),
|
|
}
|
|
svc := &adminServiceImpl{userRepo: repo}
|
|
|
|
user, err := svc.CreateUser(context.Background(), &CreateUserInput{
|
|
Email: "admin-created@example.com",
|
|
Password: "strong-pass",
|
|
})
|
|
require.NoError(t, err)
|
|
require.NotNil(t, user)
|
|
require.Equal(t, int64(55), user.ID)
|
|
require.Empty(t, repo.ensureCalls)
|
|
require.Empty(t, repo.replaceCalls)
|
|
}
|
|
|
|
func TestAdminService_UpdateUser_DoesNotReturnPartialSuccessFromEmailIdentityResync(t *testing.T) {
|
|
repo := &emailSyncRepoStub{
|
|
user: &User{
|
|
ID: 91,
|
|
Email: "before@example.com",
|
|
Role: RoleUser,
|
|
Status: StatusActive,
|
|
Concurrency: 3,
|
|
},
|
|
replaceErr: fmt.Errorf("unexpected email resync"),
|
|
}
|
|
svc := &adminServiceImpl{userRepo: repo}
|
|
|
|
updated, err := svc.UpdateUser(context.Background(), 91, &UpdateUserInput{
|
|
Email: "after@example.com",
|
|
})
|
|
require.NoError(t, err)
|
|
require.NotNil(t, updated)
|
|
require.Equal(t, "after@example.com", updated.Email)
|
|
require.Empty(t, repo.replaceCalls)
|
|
require.Empty(t, repo.ensureCalls)
|
|
}
|