mirror of
https://github.com/Wei-Shaw/sub2api.git
synced 2026-10-07 16:18:29 +08:00
Brisbanehuang
b0f5007f04
Successful upstream billing probes already persist the upstream-declared rate as a display-only snapshot. Add a per-account opt-in that writes that declared rate back to the account's rate_multiplier, so the account cost basis follows upstream repricing automatically instead of drifting until an operator notices. - new per-account flag upstream_billing_rate_sync_enabled stored next to the probe flag in account extra: enabling sync force-enables the probe, disabling the probe cascades sync off, and eligibility follows IsUpstreamBillingProbeIdentity (tightened from any non-empty platform to an explicit whitelist of the five supported API-key platforms so future platforms do not silently inherit probe/sync semantics) - only a successful probe whose declared rate survives validation (finite, within bounds, not rounded to zero at the rate_multiplier decimal(10,4) scale) writes back; failed/unsupported/invalid probes leave rate_multiplier unchanged - the writeback rides the existing snapshot CAS transaction: UpdateUpstreamBillingProbeSnapshot takes an optional rateMultiplier and applies it atomically with the snapshot under the same identity/snapshot compare-and-swap, so a probe result observed on a stale account cannot clobber a concurrent admin edit - admin edit goes through UpdateWithAccountBillingSettings, which applies the form without overwriting a rate that a probe synchronized after the edit form was loaded (nil rateMultiplier = not edited); once sync is enabled the edit form shows the rate as managed - bulk update rejects a manual rate_multiplier change when any target account has rate sync enabled (whole batch fails with a dedicated error so partial writes cannot bypass the sync ownership) - frontend: sync toggle with hints in the edit modal (probe/sync enable/disable coupling enforced in the form), synced-rate tooltip on the rate cell, bulk edit modal warns and blocks rate edits that hit sync-enabled accounts; en/zh copy updated - tests: service unit tests for sync gating/validation/cascade, sqlmock repo tests for the extended CAS, real-PostgreSQL integration tests (rate written only for successful+enabled accounts, manual rate protected after sync disabled, admin edit preserved across concurrent probe sync), handler/API contract updates, frontend specs for modal coupling, bulk rejection and rate cell
266 lines
9.5 KiB
Go
266 lines
9.5 KiB
Go
package admin
|
|
|
|
import (
|
|
"bytes"
|
|
"encoding/json"
|
|
"net/http"
|
|
"net/http/httptest"
|
|
"testing"
|
|
|
|
"github.com/Wei-Shaw/sub2api/internal/service"
|
|
"github.com/gin-gonic/gin"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func setupAccountMixedChannelRouter(adminSvc *stubAdminService) *gin.Engine {
|
|
gin.SetMode(gin.TestMode)
|
|
router := gin.New()
|
|
accountHandler := NewAccountHandler(adminSvc, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil)
|
|
router.POST("/api/v1/admin/accounts/check-mixed-channel", accountHandler.CheckMixedChannel)
|
|
router.POST("/api/v1/admin/accounts", accountHandler.Create)
|
|
router.PUT("/api/v1/admin/accounts/:id", accountHandler.Update)
|
|
router.POST("/api/v1/admin/accounts/bulk-update", accountHandler.BulkUpdate)
|
|
return router
|
|
}
|
|
|
|
func TestAccountHandlerCheckMixedChannelNoRisk(t *testing.T) {
|
|
adminSvc := newStubAdminService()
|
|
router := setupAccountMixedChannelRouter(adminSvc)
|
|
|
|
body, _ := json.Marshal(map[string]any{
|
|
"platform": "antigravity",
|
|
"group_ids": []int64{27},
|
|
})
|
|
rec := httptest.NewRecorder()
|
|
req := httptest.NewRequest(http.MethodPost, "/api/v1/admin/accounts/check-mixed-channel", bytes.NewReader(body))
|
|
req.Header.Set("Content-Type", "application/json")
|
|
router.ServeHTTP(rec, req)
|
|
|
|
require.Equal(t, http.StatusOK, rec.Code)
|
|
var resp map[string]any
|
|
require.NoError(t, json.Unmarshal(rec.Body.Bytes(), &resp))
|
|
require.Equal(t, float64(0), resp["code"])
|
|
data, ok := resp["data"].(map[string]any)
|
|
require.True(t, ok)
|
|
require.Equal(t, false, data["has_risk"])
|
|
require.Equal(t, int64(0), adminSvc.lastMixedCheck.accountID)
|
|
require.Equal(t, "antigravity", adminSvc.lastMixedCheck.platform)
|
|
require.Equal(t, []int64{27}, adminSvc.lastMixedCheck.groupIDs)
|
|
}
|
|
|
|
func TestAccountHandlerCheckMixedChannelWithRisk(t *testing.T) {
|
|
adminSvc := newStubAdminService()
|
|
adminSvc.checkMixedErr = &service.MixedChannelError{
|
|
GroupID: 27,
|
|
GroupName: "claude-max",
|
|
CurrentPlatform: "Antigravity",
|
|
OtherPlatform: "Anthropic",
|
|
}
|
|
router := setupAccountMixedChannelRouter(adminSvc)
|
|
|
|
body, _ := json.Marshal(map[string]any{
|
|
"platform": "antigravity",
|
|
"group_ids": []int64{27},
|
|
"account_id": 99,
|
|
})
|
|
rec := httptest.NewRecorder()
|
|
req := httptest.NewRequest(http.MethodPost, "/api/v1/admin/accounts/check-mixed-channel", bytes.NewReader(body))
|
|
req.Header.Set("Content-Type", "application/json")
|
|
router.ServeHTTP(rec, req)
|
|
|
|
require.Equal(t, http.StatusOK, rec.Code)
|
|
var resp map[string]any
|
|
require.NoError(t, json.Unmarshal(rec.Body.Bytes(), &resp))
|
|
require.Equal(t, float64(0), resp["code"])
|
|
data, ok := resp["data"].(map[string]any)
|
|
require.True(t, ok)
|
|
require.Equal(t, true, data["has_risk"])
|
|
require.Equal(t, "mixed_channel_warning", data["error"])
|
|
details, ok := data["details"].(map[string]any)
|
|
require.True(t, ok)
|
|
require.Equal(t, float64(27), details["group_id"])
|
|
require.Equal(t, "claude-max", details["group_name"])
|
|
require.Equal(t, "Antigravity", details["current_platform"])
|
|
require.Equal(t, "Anthropic", details["other_platform"])
|
|
require.Equal(t, int64(99), adminSvc.lastMixedCheck.accountID)
|
|
}
|
|
|
|
func TestAccountHandlerCreateMixedChannelConflictSimplifiedResponse(t *testing.T) {
|
|
adminSvc := newStubAdminService()
|
|
adminSvc.createAccountErr = &service.MixedChannelError{
|
|
GroupID: 27,
|
|
GroupName: "claude-max",
|
|
CurrentPlatform: "Antigravity",
|
|
OtherPlatform: "Anthropic",
|
|
}
|
|
router := setupAccountMixedChannelRouter(adminSvc)
|
|
|
|
body, _ := json.Marshal(map[string]any{
|
|
"name": "ag-oauth-1",
|
|
"platform": "antigravity",
|
|
"type": "oauth",
|
|
"credentials": map[string]any{"refresh_token": "rt"},
|
|
"group_ids": []int64{27},
|
|
})
|
|
rec := httptest.NewRecorder()
|
|
req := httptest.NewRequest(http.MethodPost, "/api/v1/admin/accounts", bytes.NewReader(body))
|
|
req.Header.Set("Content-Type", "application/json")
|
|
router.ServeHTTP(rec, req)
|
|
|
|
require.Equal(t, http.StatusConflict, rec.Code)
|
|
var resp map[string]any
|
|
require.NoError(t, json.Unmarshal(rec.Body.Bytes(), &resp))
|
|
require.Equal(t, "mixed_channel_warning", resp["error"])
|
|
require.Contains(t, resp["message"], "mixed_channel_warning")
|
|
_, hasDetails := resp["details"]
|
|
_, hasRequireConfirmation := resp["require_confirmation"]
|
|
require.False(t, hasDetails)
|
|
require.False(t, hasRequireConfirmation)
|
|
}
|
|
|
|
func TestAccountHandlerUpdateMixedChannelConflictSimplifiedResponse(t *testing.T) {
|
|
adminSvc := newStubAdminService()
|
|
adminSvc.updateAccountErr = &service.MixedChannelError{
|
|
GroupID: 27,
|
|
GroupName: "claude-max",
|
|
CurrentPlatform: "Antigravity",
|
|
OtherPlatform: "Anthropic",
|
|
}
|
|
router := setupAccountMixedChannelRouter(adminSvc)
|
|
|
|
body, _ := json.Marshal(map[string]any{
|
|
"group_ids": []int64{27},
|
|
})
|
|
rec := httptest.NewRecorder()
|
|
req := httptest.NewRequest(http.MethodPut, "/api/v1/admin/accounts/3", bytes.NewReader(body))
|
|
req.Header.Set("Content-Type", "application/json")
|
|
router.ServeHTTP(rec, req)
|
|
|
|
require.Equal(t, http.StatusConflict, rec.Code)
|
|
var resp map[string]any
|
|
require.NoError(t, json.Unmarshal(rec.Body.Bytes(), &resp))
|
|
require.Equal(t, "mixed_channel_warning", resp["error"])
|
|
require.Contains(t, resp["message"], "mixed_channel_warning")
|
|
_, hasDetails := resp["details"]
|
|
_, hasRequireConfirmation := resp["require_confirmation"]
|
|
require.False(t, hasDetails)
|
|
require.False(t, hasRequireConfirmation)
|
|
}
|
|
|
|
func TestAccountHandlerUpdateMapsUpstreamBillingRateSyncSettings(t *testing.T) {
|
|
adminSvc := newStubAdminService()
|
|
router := setupAccountMixedChannelRouter(adminSvc)
|
|
body, _ := json.Marshal(map[string]any{
|
|
"name": "gemini-key",
|
|
"upstream_billing_probe_enabled": true,
|
|
"upstream_billing_rate_sync_enabled": true,
|
|
})
|
|
rec := httptest.NewRecorder()
|
|
req := httptest.NewRequest(http.MethodPut, "/api/v1/admin/accounts/42", bytes.NewReader(body))
|
|
req.Header.Set("Content-Type", "application/json")
|
|
|
|
router.ServeHTTP(rec, req)
|
|
|
|
require.Equal(t, http.StatusOK, rec.Code)
|
|
require.NotNil(t, adminSvc.lastUpdateAccountInput)
|
|
require.NotNil(t, adminSvc.lastUpdateAccountInput.ProbeEnabled)
|
|
require.True(t, *adminSvc.lastUpdateAccountInput.ProbeEnabled)
|
|
require.NotNil(t, adminSvc.lastUpdateAccountInput.RateSyncEnabled)
|
|
require.True(t, *adminSvc.lastUpdateAccountInput.RateSyncEnabled)
|
|
}
|
|
|
|
func TestAccountHandlerBulkUpdateMixedChannelConflict(t *testing.T) {
|
|
adminSvc := newStubAdminService()
|
|
adminSvc.bulkUpdateAccountErr = &service.MixedChannelError{
|
|
GroupID: 27,
|
|
GroupName: "claude-max",
|
|
CurrentPlatform: "Antigravity",
|
|
OtherPlatform: "Anthropic",
|
|
}
|
|
router := setupAccountMixedChannelRouter(adminSvc)
|
|
|
|
body, _ := json.Marshal(map[string]any{
|
|
"account_ids": []int64{1, 2, 3},
|
|
"group_ids": []int64{27},
|
|
})
|
|
rec := httptest.NewRecorder()
|
|
req := httptest.NewRequest(http.MethodPost, "/api/v1/admin/accounts/bulk-update", bytes.NewReader(body))
|
|
req.Header.Set("Content-Type", "application/json")
|
|
router.ServeHTTP(rec, req)
|
|
|
|
require.Equal(t, http.StatusConflict, rec.Code)
|
|
var resp map[string]any
|
|
require.NoError(t, json.Unmarshal(rec.Body.Bytes(), &resp))
|
|
require.Equal(t, "mixed_channel_warning", resp["error"])
|
|
require.Contains(t, resp["message"], "claude-max")
|
|
}
|
|
|
|
func TestAccountHandlerBulkUpdateMixedChannelConfirmSkips(t *testing.T) {
|
|
adminSvc := newStubAdminService()
|
|
router := setupAccountMixedChannelRouter(adminSvc)
|
|
|
|
body, _ := json.Marshal(map[string]any{
|
|
"account_ids": []int64{1, 2},
|
|
"group_ids": []int64{27},
|
|
"confirm_mixed_channel_risk": true,
|
|
})
|
|
rec := httptest.NewRecorder()
|
|
req := httptest.NewRequest(http.MethodPost, "/api/v1/admin/accounts/bulk-update", bytes.NewReader(body))
|
|
req.Header.Set("Content-Type", "application/json")
|
|
router.ServeHTTP(rec, req)
|
|
|
|
require.Equal(t, http.StatusOK, rec.Code)
|
|
var resp map[string]any
|
|
require.NoError(t, json.Unmarshal(rec.Body.Bytes(), &resp))
|
|
require.Equal(t, float64(0), resp["code"])
|
|
data, ok := resp["data"].(map[string]any)
|
|
require.True(t, ok)
|
|
require.Equal(t, float64(2), data["success"])
|
|
require.Equal(t, float64(0), data["failed"])
|
|
}
|
|
|
|
func TestBulkUpdateAcceptsFilterTargetRequest(t *testing.T) {
|
|
adminSvc := newStubAdminService()
|
|
router := setupAccountMixedChannelRouter(adminSvc)
|
|
|
|
body, _ := json.Marshal(map[string]any{
|
|
"filters": map[string]any{
|
|
"platform": "openai",
|
|
"type": "oauth",
|
|
"status": "active",
|
|
"group": "12",
|
|
"privacy_mode": "blocked",
|
|
"search": "bulk-target",
|
|
},
|
|
"schedulable": true,
|
|
})
|
|
rec := httptest.NewRecorder()
|
|
req := httptest.NewRequest(http.MethodPost, "/api/v1/admin/accounts/bulk-update", bytes.NewReader(body))
|
|
req.Header.Set("Content-Type", "application/json")
|
|
router.ServeHTTP(rec, req)
|
|
|
|
require.Equal(t, http.StatusOK, rec.Code)
|
|
var resp map[string]any
|
|
require.NoError(t, json.Unmarshal(rec.Body.Bytes(), &resp))
|
|
require.Equal(t, float64(0), resp["code"])
|
|
}
|
|
|
|
func TestBulkUpdateAcceptsDedicatedUpstreamBillingProbeSetting(t *testing.T) {
|
|
adminSvc := newStubAdminService()
|
|
router := setupAccountMixedChannelRouter(adminSvc)
|
|
|
|
body, _ := json.Marshal(map[string]any{
|
|
"account_ids": []int64{1, 2},
|
|
"upstream_billing_probe_enabled": false,
|
|
})
|
|
rec := httptest.NewRecorder()
|
|
req := httptest.NewRequest(http.MethodPost, "/api/v1/admin/accounts/bulk-update", bytes.NewReader(body))
|
|
req.Header.Set("Content-Type", "application/json")
|
|
router.ServeHTTP(rec, req)
|
|
|
|
require.Equal(t, http.StatusOK, rec.Code)
|
|
require.NotNil(t, adminSvc.lastBulkUpdateAccountInput)
|
|
require.NotNil(t, adminSvc.lastBulkUpdateAccountInput.ProbeEnabled)
|
|
require.False(t, *adminSvc.lastBulkUpdateAccountInput.ProbeEnabled)
|
|
}
|