b60d8bb4cc
用户软删除后使用记录仍在,但身份(邮箱)被 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>
57 lines
1.7 KiB
Go
57 lines
1.7 KiB
Go
package admin
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"net/http"
|
|
"net/http/httptest"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/Wei-Shaw/sub2api/internal/service"
|
|
"github.com/gin-gonic/gin"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
// 捕获 ListUsers 入参、返回一个已删用户的 admin service 桩。
|
|
type searchUsersAdminStub struct {
|
|
service.AdminService
|
|
gotFilters service.UserListFilters
|
|
}
|
|
|
|
func (s *searchUsersAdminStub) ListUsers(ctx context.Context, page, pageSize int, filters service.UserListFilters, sortBy, sortOrder string) ([]service.User, int64, error) {
|
|
s.gotFilters = filters
|
|
ts := time.Date(2026, 5, 28, 0, 0, 0, 0, time.UTC)
|
|
return []service.User{
|
|
{ID: 1, Email: "active@test.com"},
|
|
{ID: 2, Email: "deleted@test.com", DeletedAt: &ts},
|
|
}, 2, nil
|
|
}
|
|
|
|
func TestAdminUsageSearchUsers_IncludesDeletedAndFlags(t *testing.T) {
|
|
gin.SetMode(gin.TestMode)
|
|
stub := &searchUsersAdminStub{}
|
|
handler := NewUsageHandler(nil, nil, stub, nil)
|
|
router := gin.New()
|
|
router.GET("/admin/usage/search-users", handler.SearchUsers)
|
|
|
|
req := httptest.NewRequest(http.MethodGet, "/admin/usage/search-users?q=test", nil)
|
|
rec := httptest.NewRecorder()
|
|
router.ServeHTTP(rec, req)
|
|
|
|
require.Equal(t, http.StatusOK, rec.Code)
|
|
require.True(t, stub.gotFilters.IncludeDeleted, "SearchUsers 必须请求 IncludeDeleted")
|
|
|
|
var resp struct {
|
|
Data []struct {
|
|
ID int64 `json:"id"`
|
|
Email string `json:"email"`
|
|
Deleted bool `json:"deleted"`
|
|
} `json:"data"`
|
|
}
|
|
require.NoError(t, json.Unmarshal(rec.Body.Bytes(), &resp))
|
|
require.Len(t, resp.Data, 2)
|
|
require.False(t, resp.Data[0].Deleted)
|
|
require.True(t, resp.Data[1].Deleted, "已删用户必须标记 deleted=true")
|
|
}
|