mirror of
https://github.com/Wei-Shaw/sub2api.git
synced 2026-09-21 05:45:26 +08:00
shaw
0fd2e9216d
针对 #3692 合并后审计发现的问题集中修复： - previous_response_id 剥离条件改为按 call_id 全覆盖校验， 部分可重建的工具续链不再被误剥离（不受开关门控的行为回归） - 粘性加权回退路径补分组归属校验并清理失效绑定，杜绝跨分组账号泄漏 - 账号列表页：无 OpenAI 账号时跳过分数计算、过滤池限定 openai 平台、 负载批查合并为账号并集一次查询，消除全表扫描与 Redis N+1 - 订阅优先模式下常规池不可用时回退订阅池等待计划， busy-but-waitable 的订阅账号不再导致请求硬失败 - TopK/权重 DB 覆盖显式受总开关门控，与兄弟子开关语义一致 - 前端未分组 OpenAI 账号回退展示基础分，不再显示 "-" - ListAllWithFilters 等能力正式进入 AccountRepository/AdminService 接口， 移除匿名接口断言与静默降级；负载批查失败补 warn 日志 - SelectAccountWithSchedulerForCapability 增加显式 previousResponseCanMove 参数，移除 "previous_response_can_move" 魔法字符串哨兵 - 设置写入路径补"基础权重不得全为零"聚合校验； 运行时设置批量读取失败的降级路径覆盖全部键并留痕
269 lines
10 KiB
Go
269 lines
10 KiB
Go
//go:build unit
|
|
|
|
package service
|
|
|
|
import (
|
|
"context"
|
|
"testing"
|
|
|
|
"github.com/Wei-Shaw/sub2api/internal/pkg/pagination"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
type accountRepoStubForAdminList struct {
|
|
accountRepoStub
|
|
|
|
listWithFiltersCalls int
|
|
listWithFiltersParams pagination.PaginationParams
|
|
listWithFiltersPlatform string
|
|
listWithFiltersType string
|
|
listWithFiltersStatus string
|
|
listWithFiltersSearch string
|
|
listWithFiltersPrivacy string
|
|
listWithFiltersAccounts []Account
|
|
listWithFiltersResult *pagination.PaginationResult
|
|
listWithFiltersErr error
|
|
}
|
|
|
|
func (s *accountRepoStubForAdminList) ListAllWithFilters(context.Context, string, string, string, string, int64, string) ([]Account, error) {
|
|
return nil, nil
|
|
}
|
|
|
|
func (s *accountRepoStubForAdminList) ListWithFilters(_ context.Context, params pagination.PaginationParams, platform, accountType, status, search string, groupID int64, privacyMode string) ([]Account, *pagination.PaginationResult, error) {
|
|
s.listWithFiltersCalls++
|
|
s.listWithFiltersParams = params
|
|
s.listWithFiltersPlatform = platform
|
|
s.listWithFiltersType = accountType
|
|
s.listWithFiltersStatus = status
|
|
s.listWithFiltersSearch = search
|
|
s.listWithFiltersPrivacy = privacyMode
|
|
|
|
if s.listWithFiltersErr != nil {
|
|
return nil, nil, s.listWithFiltersErr
|
|
}
|
|
|
|
result := s.listWithFiltersResult
|
|
if result == nil {
|
|
result = &pagination.PaginationResult{
|
|
Total: int64(len(s.listWithFiltersAccounts)),
|
|
Page: params.Page,
|
|
PageSize: params.PageSize,
|
|
}
|
|
}
|
|
|
|
return s.listWithFiltersAccounts, result, nil
|
|
}
|
|
|
|
type proxyRepoStubForAdminList struct {
|
|
proxyRepoStub
|
|
|
|
listWithFiltersCalls int
|
|
listWithFiltersParams pagination.PaginationParams
|
|
listWithFiltersProtocol string
|
|
listWithFiltersStatus string
|
|
listWithFiltersSearch string
|
|
listWithFiltersProxies []Proxy
|
|
listWithFiltersResult *pagination.PaginationResult
|
|
listWithFiltersErr error
|
|
|
|
listWithFiltersAndAccountCountCalls int
|
|
listWithFiltersAndAccountCountParams pagination.PaginationParams
|
|
listWithFiltersAndAccountCountProtocol string
|
|
listWithFiltersAndAccountCountStatus string
|
|
listWithFiltersAndAccountCountSearch string
|
|
listWithFiltersAndAccountCountProxies []ProxyWithAccountCount
|
|
listWithFiltersAndAccountCountResult *pagination.PaginationResult
|
|
listWithFiltersAndAccountCountErr error
|
|
}
|
|
|
|
func (s *proxyRepoStubForAdminList) ListWithFilters(_ context.Context, params pagination.PaginationParams, protocol, status, search string) ([]Proxy, *pagination.PaginationResult, error) {
|
|
s.listWithFiltersCalls++
|
|
s.listWithFiltersParams = params
|
|
s.listWithFiltersProtocol = protocol
|
|
s.listWithFiltersStatus = status
|
|
s.listWithFiltersSearch = search
|
|
|
|
if s.listWithFiltersErr != nil {
|
|
return nil, nil, s.listWithFiltersErr
|
|
}
|
|
|
|
result := s.listWithFiltersResult
|
|
if result == nil {
|
|
result = &pagination.PaginationResult{
|
|
Total: int64(len(s.listWithFiltersProxies)),
|
|
Page: params.Page,
|
|
PageSize: params.PageSize,
|
|
}
|
|
}
|
|
|
|
return s.listWithFiltersProxies, result, nil
|
|
}
|
|
|
|
func (s *proxyRepoStubForAdminList) ListWithFiltersAndAccountCount(_ context.Context, params pagination.PaginationParams, protocol, status, search string) ([]ProxyWithAccountCount, *pagination.PaginationResult, error) {
|
|
s.listWithFiltersAndAccountCountCalls++
|
|
s.listWithFiltersAndAccountCountParams = params
|
|
s.listWithFiltersAndAccountCountProtocol = protocol
|
|
s.listWithFiltersAndAccountCountStatus = status
|
|
s.listWithFiltersAndAccountCountSearch = search
|
|
|
|
if s.listWithFiltersAndAccountCountErr != nil {
|
|
return nil, nil, s.listWithFiltersAndAccountCountErr
|
|
}
|
|
|
|
result := s.listWithFiltersAndAccountCountResult
|
|
if result == nil {
|
|
result = &pagination.PaginationResult{
|
|
Total: int64(len(s.listWithFiltersAndAccountCountProxies)),
|
|
Page: params.Page,
|
|
PageSize: params.PageSize,
|
|
}
|
|
}
|
|
|
|
return s.listWithFiltersAndAccountCountProxies, result, nil
|
|
}
|
|
|
|
type redeemRepoStubForAdminList struct {
|
|
redeemRepoStub
|
|
|
|
listWithFiltersCalls int
|
|
listWithFiltersParams pagination.PaginationParams
|
|
listWithFiltersType string
|
|
listWithFiltersStatus string
|
|
listWithFiltersSearch string
|
|
listWithFiltersCodes []RedeemCode
|
|
listWithFiltersResult *pagination.PaginationResult
|
|
listWithFiltersErr error
|
|
}
|
|
|
|
func (s *redeemRepoStubForAdminList) ListWithFilters(_ context.Context, params pagination.PaginationParams, codeType, status, search string) ([]RedeemCode, *pagination.PaginationResult, error) {
|
|
s.listWithFiltersCalls++
|
|
s.listWithFiltersParams = params
|
|
s.listWithFiltersType = codeType
|
|
s.listWithFiltersStatus = status
|
|
s.listWithFiltersSearch = search
|
|
|
|
if s.listWithFiltersErr != nil {
|
|
return nil, nil, s.listWithFiltersErr
|
|
}
|
|
|
|
result := s.listWithFiltersResult
|
|
if result == nil {
|
|
result = &pagination.PaginationResult{
|
|
Total: int64(len(s.listWithFiltersCodes)),
|
|
Page: params.Page,
|
|
PageSize: params.PageSize,
|
|
}
|
|
}
|
|
|
|
return s.listWithFiltersCodes, result, nil
|
|
}
|
|
|
|
func (s *redeemRepoStubForAdminList) ListByUserPaginated(_ context.Context, userID int64, params pagination.PaginationParams, codeType string) ([]RedeemCode, *pagination.PaginationResult, error) {
|
|
panic("unexpected ListByUserPaginated call")
|
|
}
|
|
|
|
func (s *redeemRepoStubForAdminList) SumPositiveBalanceByUser(_ context.Context, userID int64) (float64, error) {
|
|
panic("unexpected SumPositiveBalanceByUser call")
|
|
}
|
|
|
|
func TestAdminService_ListAccounts_WithSearch(t *testing.T) {
|
|
t.Run("search 参数正常传递到 repository 层", func(t *testing.T) {
|
|
repo := &accountRepoStubForAdminList{
|
|
listWithFiltersAccounts: []Account{{ID: 1, Name: "acc"}},
|
|
listWithFiltersResult: &pagination.PaginationResult{Total: 10},
|
|
}
|
|
svc := &adminServiceImpl{accountRepo: repo}
|
|
|
|
accounts, total, err := svc.ListAccounts(context.Background(), 1, 20, PlatformGemini, AccountTypeOAuth, StatusActive, "acc", 0, "", "name", "ASC")
|
|
require.NoError(t, err)
|
|
require.Equal(t, int64(10), total)
|
|
require.Equal(t, []Account{{ID: 1, Name: "acc"}}, accounts)
|
|
|
|
require.Equal(t, 1, repo.listWithFiltersCalls)
|
|
require.Equal(t, pagination.PaginationParams{Page: 1, PageSize: 20, SortBy: "name", SortOrder: "ASC"}, repo.listWithFiltersParams)
|
|
require.Equal(t, PlatformGemini, repo.listWithFiltersPlatform)
|
|
require.Equal(t, AccountTypeOAuth, repo.listWithFiltersType)
|
|
require.Equal(t, StatusActive, repo.listWithFiltersStatus)
|
|
require.Equal(t, "acc", repo.listWithFiltersSearch)
|
|
})
|
|
}
|
|
|
|
func TestAdminService_ListAccounts_WithPrivacyMode(t *testing.T) {
|
|
t.Run("privacy_mode 参数正常传递到 repository 层", func(t *testing.T) {
|
|
repo := &accountRepoStubForAdminList{
|
|
listWithFiltersAccounts: []Account{{ID: 2, Name: "acc2"}},
|
|
listWithFiltersResult: &pagination.PaginationResult{Total: 1},
|
|
}
|
|
svc := &adminServiceImpl{accountRepo: repo}
|
|
|
|
accounts, total, err := svc.ListAccounts(context.Background(), 1, 20, PlatformOpenAI, AccountTypeOAuth, StatusActive, "acc2", 0, PrivacyModeCFBlocked, "", "")
|
|
require.NoError(t, err)
|
|
require.Equal(t, int64(1), total)
|
|
require.Equal(t, []Account{{ID: 2, Name: "acc2"}}, accounts)
|
|
require.Equal(t, PrivacyModeCFBlocked, repo.listWithFiltersPrivacy)
|
|
})
|
|
}
|
|
|
|
func TestAdminService_ListProxies_WithSearch(t *testing.T) {
|
|
t.Run("search 参数正常传递到 repository 层", func(t *testing.T) {
|
|
repo := &proxyRepoStubForAdminList{
|
|
listWithFiltersProxies: []Proxy{{ID: 2, Name: "p1"}},
|
|
listWithFiltersResult: &pagination.PaginationResult{Total: 7},
|
|
}
|
|
svc := &adminServiceImpl{proxyRepo: repo}
|
|
|
|
proxies, total, err := svc.ListProxies(context.Background(), 3, 50, "http", StatusActive, "p1", "name", "ASC")
|
|
require.NoError(t, err)
|
|
require.Equal(t, int64(7), total)
|
|
require.Equal(t, []Proxy{{ID: 2, Name: "p1"}}, proxies)
|
|
|
|
require.Equal(t, 1, repo.listWithFiltersCalls)
|
|
require.Equal(t, pagination.PaginationParams{Page: 3, PageSize: 50, SortBy: "name", SortOrder: "ASC"}, repo.listWithFiltersParams)
|
|
require.Equal(t, "http", repo.listWithFiltersProtocol)
|
|
require.Equal(t, StatusActive, repo.listWithFiltersStatus)
|
|
require.Equal(t, "p1", repo.listWithFiltersSearch)
|
|
})
|
|
}
|
|
|
|
func TestAdminService_ListProxiesWithAccountCount_WithSearch(t *testing.T) {
|
|
t.Run("search 参数正常传递到 repository 层", func(t *testing.T) {
|
|
repo := &proxyRepoStubForAdminList{
|
|
listWithFiltersAndAccountCountProxies: []ProxyWithAccountCount{{Proxy: Proxy{ID: 3, Name: "p2"}, AccountCount: 5}},
|
|
listWithFiltersAndAccountCountResult: &pagination.PaginationResult{Total: 9},
|
|
}
|
|
svc := &adminServiceImpl{proxyRepo: repo}
|
|
|
|
proxies, total, err := svc.ListProxiesWithAccountCount(context.Background(), 2, 10, "socks5", StatusDisabled, "p2", "account_count", "DESC")
|
|
require.NoError(t, err)
|
|
require.Equal(t, int64(9), total)
|
|
require.Equal(t, []ProxyWithAccountCount{{Proxy: Proxy{ID: 3, Name: "p2"}, AccountCount: 5}}, proxies)
|
|
|
|
require.Equal(t, 1, repo.listWithFiltersAndAccountCountCalls)
|
|
require.Equal(t, pagination.PaginationParams{Page: 2, PageSize: 10, SortBy: "account_count", SortOrder: "DESC"}, repo.listWithFiltersAndAccountCountParams)
|
|
require.Equal(t, "socks5", repo.listWithFiltersAndAccountCountProtocol)
|
|
require.Equal(t, StatusDisabled, repo.listWithFiltersAndAccountCountStatus)
|
|
require.Equal(t, "p2", repo.listWithFiltersAndAccountCountSearch)
|
|
})
|
|
}
|
|
|
|
func TestAdminService_ListRedeemCodes_WithSearch(t *testing.T) {
|
|
t.Run("search 参数正常传递到 repository 层", func(t *testing.T) {
|
|
repo := &redeemRepoStubForAdminList{
|
|
listWithFiltersCodes: []RedeemCode{{ID: 4, Code: "ABC"}},
|
|
listWithFiltersResult: &pagination.PaginationResult{Total: 3},
|
|
}
|
|
svc := &adminServiceImpl{redeemCodeRepo: repo}
|
|
|
|
codes, total, err := svc.ListRedeemCodes(context.Background(), 1, 20, RedeemTypeBalance, StatusUnused, "ABC", "value", "ASC")
|
|
require.NoError(t, err)
|
|
require.Equal(t, int64(3), total)
|
|
require.Equal(t, []RedeemCode{{ID: 4, Code: "ABC"}}, codes)
|
|
|
|
require.Equal(t, 1, repo.listWithFiltersCalls)
|
|
require.Equal(t, pagination.PaginationParams{Page: 1, PageSize: 20, SortBy: "value", SortOrder: "ASC"}, repo.listWithFiltersParams)
|
|
require.Equal(t, RedeemTypeBalance, repo.listWithFiltersType)
|
|
require.Equal(t, StatusUnused, repo.listWithFiltersStatus)
|
|
require.Equal(t, "ABC", repo.listWithFiltersSearch)
|
|
})
|
|
}
|