feat: improve account admin filters and bulk model inputs

Author: zjarlin

backend/internal/handler/admin/account_data.go

@@ -8,13 +8,11 @@ import (
 	"strings"
 	"time"
 
-	"log/slog"
-
-	infraerrors "github.com/Wei-Shaw/sub2api/internal/pkg/errors"
 	"github.com/Wei-Shaw/sub2api/internal/pkg/openai"
 	"github.com/Wei-Shaw/sub2api/internal/pkg/response"
 	"github.com/Wei-Shaw/sub2api/internal/service"
 	"github.com/gin-gonic/gin"
+	"log/slog"
 )
 
 const (
@@ -373,12 +371,12 @@ func (h *AccountHandler) listAllProxies(ctx context.Context) ([]service.Proxy, e
 	return out, nil
 }
 
-func (h *AccountHandler) listAccountsFiltered(ctx context.Context, platform, accountType, status, search string, groupID int64, privacyMode, sortBy, sortOrder string) ([]service.Account, error) {
+func (h *AccountHandler) listAccountsFiltered(ctx context.Context, platform, accountType, status, schedulable, search string, groupID int64, privacyMode, displayGroup, namePrefix, searchRegex, sortBy, sortOrder string) ([]service.Account, error) {
 	page := 1
 	pageSize := dataPageCap
 	var out []service.Account
 	for {
-		items, total, err := h.adminService.ListAccounts(ctx, page, pageSize, platform, accountType, status, search, groupID, privacyMode, sortBy, sortOrder)
+		items, total, err := h.adminService.ListAccounts(ctx, page, pageSize, platform, accountType, status, schedulable, search, groupID, privacyMode, displayGroup, namePrefix, searchRegex, sortBy, sortOrder)
 		if err != nil {
 			return nil, err
 		}
@@ -407,31 +405,12 @@ func (h *AccountHandler) resolveExportAccounts(ctx context.Context, ids []int64,
 		return out, nil
 	}
 
-	platform := c.Query("platform")
-	accountType := c.Query("type")
-	status := c.Query("status")
-	privacyMode := strings.TrimSpace(c.Query("privacy_mode"))
-	search := strings.TrimSpace(c.Query("search"))
-	sortBy := c.DefaultQuery("sort_by", "name")
-	sortOrder := c.DefaultQuery("sort_order", "asc")
-	if len(search) > 100 {
-		search = search[:100]
-	}
-
-	groupID := int64(0)
-	if groupIDStr := c.Query("group"); groupIDStr != "" {
-		if groupIDStr == accountListGroupUngroupedQueryValue {
-			groupID = service.AccountListGroupUngrouped
-		} else {
-			parsedGroupID, parseErr := strconv.ParseInt(groupIDStr, 10, 64)
-			if parseErr != nil || parsedGroupID <= 0 {
-				return nil, infraerrors.BadRequest("INVALID_GROUP_FILTER", "invalid group filter")
-			}
-			groupID = parsedGroupID
-		}
+	filters, err := parseAccountListQueryFilters(c)
+	if err != nil {
+		return nil, err
 	}
 
-	return h.listAccountsFiltered(ctx, platform, accountType, status, search, groupID, privacyMode, sortBy, sortOrder)
+	return h.listAccountsFiltered(ctx, filters.platform, filters.accountType, filters.status, filters.schedulable, filters.search, filters.groupID, filters.privacyMode, filters.displayGroup, filters.namePrefix, filters.searchRegex, filters.sortBy, filters.sortOrder)
 }
 
 func (h *AccountHandler) resolveExportProxies(ctx context.Context, accounts []service.Account) ([]service.Proxy, error) {

backend/internal/handler/admin/account_data_handler_test.go

@@ -181,7 +181,7 @@ func TestExportDataPassesAccountFiltersAndSort(t *testing.T) {
 	rec := httptest.NewRecorder()
 	req := httptest.NewRequest(
 		http.MethodGet,
-		"/api/v1/admin/accounts/data?platform=openai&type=oauth&status=active&group=12&privacy_mode=blocked&search=keyword&sort_by=priority&sort_order=desc",
+		"/api/v1/admin/accounts/data?platform=openai&type=oauth&status=active&schedulable=false&group=12&privacy_mode=blocked&display_group=pool-a&name_prefix=prod&search=keyword&search_regex=claude&sort_by=priority&sort_order=desc",
 		nil,
 	)
 	router.ServeHTTP(rec, req)
@@ -191,9 +191,13 @@ func TestExportDataPassesAccountFiltersAndSort(t *testing.T) {
 	require.Equal(t, "openai", adminSvc.lastListAccounts.platform)
 	require.Equal(t, "oauth", adminSvc.lastListAccounts.accountType)
 	require.Equal(t, "active", adminSvc.lastListAccounts.status)
+	require.Equal(t, "false", adminSvc.lastListAccounts.schedulable)
 	require.Equal(t, int64(12), adminSvc.lastListAccounts.groupID)
 	require.Equal(t, "blocked", adminSvc.lastListAccounts.privacyMode)
+	require.Equal(t, "pool-a", adminSvc.lastListAccounts.displayGroup)
+	require.Equal(t, "prod", adminSvc.lastListAccounts.namePrefix)
 	require.Equal(t, "keyword", adminSvc.lastListAccounts.search)
+	require.Equal(t, "claude", adminSvc.lastListAccounts.searchRegex)
 	require.Equal(t, "priority", adminSvc.lastListAccounts.sortBy)
 	require.Equal(t, "desc", adminSvc.lastListAccounts.sortOrder)
 }

backend/internal/handler/admin/account_handler.go

@@ -11,6 +11,7 @@ import (
 	"log"
 	"log/slog"
 	"net/http"
+	"regexp"
 	"strconv"
 	"strings"
 	"sync"
@@ -151,12 +152,16 @@ type BulkUpdateAccountsRequest struct {
 }
 
 type BulkUpdateAccountFilters struct {
-	Platform    string `json:"platform"`
-	Type        string `json:"type"`
-	Status      string `json:"status"`
-	Group       string `json:"group"`
-	Search      string `json:"search"`
-	PrivacyMode string `json:"privacy_mode"`
+	Platform     string `json:"platform"`
+	Type         string `json:"type"`
+	Status       string `json:"status"`
+	Schedulable  string `json:"schedulable"`
+	Group        string `json:"group"`
+	Search       string `json:"search"`
+	PrivacyMode  string `json:"privacy_mode"`
+	DisplayGroup string `json:"display_group"`
+	NamePrefix   string `json:"name_prefix"`
+	SearchRegex  string `json:"search_regex"`
 }
 
 // CheckMixedChannelRequest represents check mixed channel risk request
@@ -178,6 +183,90 @@ type AccountWithConcurrency struct {
 
 const accountListGroupUngroupedQueryValue = "ungrouped"
 
+type accountListQueryFilters struct {
+	platform     string
+	accountType  string
+	status       string
+	schedulable  string
+	search       string
+	groupID      int64
+	privacyMode  string
+	displayGroup string
+	namePrefix   string
+	searchRegex  string
+	sortBy       string
+	sortOrder    string
+}
+
+func normalizeSchedulableFilter(raw string) (string, error) {
+	switch strings.ToLower(strings.TrimSpace(raw)) {
+	case "", "all":
+		return "", nil
+	case "true", "1", "enabled", "on":
+		return "true", nil
+	case "false", "0", "disabled", "off":
+		return "false", nil
+	default:
+		return "", infraerrors.BadRequest("INVALID_SCHEDULABLE_FILTER", "invalid schedulable filter")
+	}
+}
+
+func parseAccountListQueryFilters(c *gin.Context) (*accountListQueryFilters, error) {
+	search := strings.TrimSpace(c.Query("search"))
+	if len(search) > 100 {
+		search = search[:100]
+	}
+	displayGroup := strings.TrimSpace(c.Query("display_group"))
+	if len(displayGroup) > 100 {
+		displayGroup = displayGroup[:100]
+	}
+	namePrefix := strings.TrimSpace(c.Query("name_prefix"))
+	if len(namePrefix) > 100 {
+		namePrefix = namePrefix[:100]
+	}
+	searchRegex := strings.TrimSpace(c.Query("search_regex"))
+	if len(searchRegex) > 512 {
+		return nil, infraerrors.BadRequest("INVALID_SEARCH_REGEX", "search regex is too long")
+	}
+	if searchRegex != "" {
+		if _, err := regexp.Compile(searchRegex); err != nil {
+			return nil, infraerrors.BadRequest("INVALID_SEARCH_REGEX", "invalid search regex")
+		}
+	}
+	schedulable, err := normalizeSchedulableFilter(c.Query("schedulable"))
+	if err != nil {
+		return nil, err
+	}
+
+	groupID := int64(0)
+	if groupIDStr := c.Query("group"); groupIDStr != "" {
+		if groupIDStr == accountListGroupUngroupedQueryValue {
+			groupID = service.AccountListGroupUngrouped
+		} else {
+			parsedGroupID, parseErr := strconv.ParseInt(groupIDStr, 10, 64)
+			if parseErr != nil || parsedGroupID < 0 {
+				return nil, infraerrors.BadRequest("INVALID_GROUP_FILTER", "invalid group filter")
+			}
+			groupID = parsedGroupID
+		}
+	}
+
+	return &accountListQueryFilters{
+		platform:     c.Query("platform"),
+		accountType:  c.Query("type"),
+		status:       c.Query("status"),
+		schedulable:  schedulable,
+		search:       search,
+		groupID:      groupID,
+		privacyMode:  strings.TrimSpace(c.Query("privacy_mode")),
+		displayGroup: displayGroup,
+		namePrefix:   namePrefix,
+		searchRegex:  searchRegex,
+		sortBy:       c.DefaultQuery("sort_by", "name"),
+		sortOrder:    c.DefaultQuery("sort_order", "asc"),
+	}, nil
+}
+
 func (h *AccountHandler) buildAccountResponseWithRuntime(ctx context.Context, account *service.Account) AccountWithConcurrency {
 	item := AccountWithConcurrency{
 		Account:            dto.AccountFromService(account),
@@ -226,39 +315,13 @@ func (h *AccountHandler) buildAccountResponseWithRuntime(ctx context.Context, ac
 // GET /api/v1/admin/accounts
 func (h *AccountHandler) List(c *gin.Context) {
 	page, pageSize := response.ParsePagination(c)
-	platform := c.Query("platform")
-	accountType := c.Query("type")
-	status := c.Query("status")
-	search := c.Query("search")
-	privacyMode := strings.TrimSpace(c.Query("privacy_mode"))
-	sortBy := c.DefaultQuery("sort_by", "name")
-	sortOrder := c.DefaultQuery("sort_order", "asc")
-	// 标准化和验证 search 参数
-	search = strings.TrimSpace(search)
-	if len(search) > 100 {
-		search = search[:100]
+	filters, err := parseAccountListQueryFilters(c)
+	if err != nil {
+		response.ErrorFrom(c, err)
+		return
 	}
 	lite := parseBoolQueryWithDefault(c.Query("lite"), false)
-
-	var groupID int64
-	if groupIDStr := c.Query("group"); groupIDStr != "" {
-		if groupIDStr == accountListGroupUngroupedQueryValue {
-			groupID = service.AccountListGroupUngrouped
-		} else {
-			parsedGroupID, parseErr := strconv.ParseInt(groupIDStr, 10, 64)
-			if parseErr != nil {
-				response.ErrorFrom(c, infraerrors.BadRequest("INVALID_GROUP_FILTER", "invalid group filter"))
-				return
-			}
-			if parsedGroupID < 0 {
-				response.ErrorFrom(c, infraerrors.BadRequest("INVALID_GROUP_FILTER", "invalid group filter"))
-				return
-			}
-			groupID = parsedGroupID
-		}
-	}
-
-	accounts, total, err := h.adminService.ListAccounts(c.Request.Context(), page, pageSize, platform, accountType, status, search, groupID, privacyMode, sortBy, sortOrder)
+	accounts, total, err := h.adminService.ListAccounts(c.Request.Context(), page, pageSize, filters.platform, filters.accountType, filters.status, filters.schedulable, filters.search, filters.groupID, filters.privacyMode, filters.displayGroup, filters.namePrefix, filters.searchRegex, filters.sortBy, filters.sortOrder)
 	if err != nil {
 		response.ErrorFrom(c, err)
 		return
@@ -380,7 +443,7 @@ func (h *AccountHandler) List(c *gin.Context) {
 		result[i] = item
 	}
 
-	etag := buildAccountsListETag(result, total, page, pageSize, platform, accountType, status, search, lite)
+	etag := buildAccountsListETag(result, total, page, pageSize, filters.platform, filters.accountType, filters.status, filters.schedulable, filters.search, lite)
 	if etag != "" {
 		c.Header("ETag", etag)
 		c.Header("Vary", "If-None-Match")
@@ -397,7 +460,7 @@ func buildAccountsListETag(
 	items []AccountWithConcurrency,
 	total int64,
 	page, pageSize int,
-	platform, accountType, status, search string,
+	platform, accountType, status, schedulable, search string,
 	lite bool,
 ) string {
 	payload := struct {
@@ -407,6 +470,7 @@ func buildAccountsListETag(
 		Platform    string                   `json:"platform"`
 		AccountType string                   `json:"type"`
 		Status      string                   `json:"status"`
+		Schedulable string                   `json:"schedulable"`
 		Search      string                   `json:"search"`
 		Lite        bool                     `json:"lite"`
 		Items       []AccountWithConcurrency `json:"items"`
@@ -417,6 +481,7 @@ func buildAccountsListETag(
 		Platform:    platform,
 		AccountType: accountType,
 		Status:      status,
+		Schedulable: schedulable,
 		Search:      search,
 		Lite:        lite,
 		Items:       items,
@@ -1489,12 +1554,16 @@ func toServiceBulkUpdateAccountFilters(filters *BulkUpdateAccountFilters) *servi
 		return nil
 	}
 	return &service.BulkUpdateAccountFilters{
-		Platform:    filters.Platform,
-		Type:        filters.Type,
-		Status:      filters.Status,
-		Group:       filters.Group,
-		Search:      filters.Search,
-		PrivacyMode: filters.PrivacyMode,
+		Platform:     filters.Platform,
+		Type:         filters.Type,
+		Status:       filters.Status,
+		Schedulable:  filters.Schedulable,
+		Group:        filters.Group,
+		Search:       filters.Search,
+		PrivacyMode:  filters.PrivacyMode,
+		DisplayGroup: filters.DisplayGroup,
+		NamePrefix:   filters.NamePrefix,
+		SearchRegex:  filters.SearchRegex,
 	}
 }
 
@@ -2107,7 +2176,7 @@ func (h *AccountHandler) BatchRefreshTier(c *gin.Context) {
 	accounts := make([]*service.Account, 0)
 
 	if len(req.AccountIDs) == 0 {
-		allAccounts, _, err := h.adminService.ListAccounts(ctx, 1, 10000, "gemini", "oauth", "", "", 0, "", "name", "asc")
+		allAccounts, _, err := h.adminService.ListAccounts(ctx, 1, 10000, "gemini", "oauth", "", "", "", 0, "", "", "", "", "name", "asc")
 		if err != nil {
 			response.ErrorFrom(c, err)
 			return

backend/internal/handler/admin/admin_service_stub_test.go

@@ -34,15 +34,19 @@ type stubAdminService struct {
 		groupIDs  []int64
 	}
 	lastListAccounts struct {
-		platform    string
-		accountType string
-		status      string
-		search      string
-		groupID     int64
-		privacyMode string
-		sortBy      string
-		sortOrder   string
-		calls       int
+		platform     string
+		accountType  string
+		status       string
+		schedulable  string
+		search       string
+		groupID      int64
+		privacyMode  string
+		displayGroup string
+		namePrefix   string
+		searchRegex  string
+		sortBy       string
+		sortOrder    string
+		calls        int
 	}
 	lastListUsers struct {
 		page      int
@@ -299,13 +303,17 @@ func (s *stubAdminService) BatchSetGroupRPMOverrides(_ context.Context, _ int64,
 	return nil
 }
 
-func (s *stubAdminService) ListAccounts(ctx context.Context, page, pageSize int, platform, accountType, status, search string, groupID int64, privacyMode string, sortBy, sortOrder string) ([]service.Account, int64, error) {
+func (s *stubAdminService) ListAccounts(ctx context.Context, page, pageSize int, platform, accountType, status, schedulable, search string, groupID int64, privacyMode, displayGroup, namePrefix, searchRegex, sortBy, sortOrder string) ([]service.Account, int64, error) {
 	s.lastListAccounts.platform = platform
 	s.lastListAccounts.accountType = accountType
 	s.lastListAccounts.status = status
+	s.lastListAccounts.schedulable = schedulable
 	s.lastListAccounts.search = search
 	s.lastListAccounts.groupID = groupID
 	s.lastListAccounts.privacyMode = privacyMode
+	s.lastListAccounts.displayGroup = displayGroup
+	s.lastListAccounts.namePrefix = namePrefix
+	s.lastListAccounts.searchRegex = searchRegex
 	s.lastListAccounts.sortBy = sortBy
 	s.lastListAccounts.sortOrder = sortOrder
 	s.lastListAccounts.calls++