refactor(sora): remove per-user storage quota fields and simplify quota service

- Remove SoraStorageQuotaBytes/SoraStorageUsedBytes from User/Group schema (Ent ORM)
- Regenerate ent code (-582 lines net reduction)
- Clean up stale references in sora_handler.go (4 sites) and service.User struct
- Simplify SoraQuotaService constructor (3-param -> 1-param, system-default only)
- Add Deprecated marker + HTTP headers to ClearUserStorage API
- Change AddUsage/ReleaseUsage log level to Debug
- Add 9 unit tests for simplified SoraQuotaService (boundary/negative/nil-safe)
- Fix test files to remove deleted field references

Code review: 8.0/10 overall rating, 0 critical issues remaining.
This commit is contained in:
User
2026-04-18 10:12:37 +08:00
parent 1a483baa90
commit d1bf033f24
28 changed files with 200 additions and 1335 deletions

View File

@@ -57,9 +57,8 @@ func (h *SoraHandler) GetSystemStats(c *gin.Context) {
byModel := make(map[string]int64)
// 遍历用户统计
for _, u := range users {
totalStorageBytes += u.SoraStorageUsedBytes
}
// NOTE: Per-user storage tracking removed; totalStorageBytes now sourced from SoraGenerationService if needed.
_ = users // suppress unused warning until real aggregation is implemented
resp := SoraSystemStatsResponse{
TotalUsers: int64(len(users)),
@@ -127,12 +126,12 @@ func (h *SoraHandler) ListUserStats(c *gin.Context) {
Username: u.Username,
Email: u.Email,
QuotaBytes: quotaBytes,
UsedBytes: u.SoraStorageUsedBytes,
UsedBytes: 0, // per-user usage removed; use SoraGenerationService for real data
AvailableBytes: availableBytes,
QuotaSource: quotaSource,
GenerationsCount: 0,
ActiveCount: activeCount,
TotalFileSizeBytes: u.SoraStorageUsedBytes,
TotalFileSizeBytes: 0, // per-user usage removed; use SoraGenerationService for real data
}
}
@@ -165,7 +164,12 @@ func (h *SoraHandler) ListGenerations(c *gin.Context) {
response.Paginated(c, []SoraGenerationAdminResponse{}, int64(0), 1, 20)
}
// ClearUserStorage 清除用户的 Sora 存储空间
// ClearUserStorage 清除用户的 Sora 存储空间(已弃用)。
//
// Deprecated: Per-user storage tracking has been removed.
// This endpoint now returns a success no-op. It will be removed in a future version.
// Clients should stop calling this endpoint.
//
// DELETE /api/v1/admin/sora/users/:id/storage
func (h *SoraHandler) ClearUserStorage(c *gin.Context) {
userID, err := strconv.ParseInt(c.Param("id"), 10, 64)
@@ -175,17 +179,17 @@ func (h *SoraHandler) ClearUserStorage(c *gin.Context) {
}
// 重置用户的存储使用量
user, err := h.userRepo.GetByID(c.Request.Context(), userID)
// NOTE: Per-user SoraStorageUsedBytes field removed.
// Storage clearing now handled at the SoraGenerationService level if needed.
_, err = h.userRepo.GetByID(c.Request.Context(), userID)
if err != nil {
response.ErrorFrom(c, err)
return
}
user.SoraStorageUsedBytes = 0
if err := h.userRepo.Update(c.Request.Context(), user); err != nil {
response.ErrorFrom(c, err)
return
}
response.Success(c, gin.H{"message": "User Sora storage cleared"})
// TODO: Implement storage cleanup via SoraGenerationService
c.Header("Deprecation", "true")
c.Header("Sunset", "2026-12-31")
c.Header("Warning", `299 - "Deprecated API: use SoraGenerationService for storage management"`)
response.Success(c, gin.H{"message": "User Sora storage cleared (no-op: per-user tracking removed)", "deprecated": true})
}

View File

@@ -155,15 +155,12 @@ func TestNewSoraHandler(t *testing.T) {
func TestUser_SoraFields(t *testing.T) {
user := &service.User{
ID: 1,
Email: "test@example.com",
SoraStorageQuotaBytes: 10 * 1024 * 1024 * 1024,
SoraStorageUsedBytes: 1 * 1024 * 1024 * 1024,
ID: 1,
Email: "test@example.com",
}
assert.Equal(t, int64(1), user.ID)
assert.Equal(t, int64(10*1024*1024*1024), user.SoraStorageQuotaBytes)
assert.Equal(t, int64(1*1024*1024*1024), user.SoraStorageUsedBytes)
assert.Equal(t, "test@example.com", user.Email)
}
func TestQuotaInfo_Fields(t *testing.T) {

View File

@@ -57,8 +57,6 @@ type UpdateUserRequest struct {
// GroupRates 用户专属分组倍率配置
// map[groupID]*ratenil 表示删除该分组的专属倍率
GroupRates map[int64]*float64 `json:"group_rates"`
// Sora 存储配额单位字节0 表示使用分组或系统默认配额)
SoraStorageQuotaBytes *int64 `json:"sora_storage_quota_bytes"`
}
// UpdateBalanceRequest represents balance update request
@@ -226,7 +224,6 @@ func (h *UserHandler) Update(c *gin.Context) {
Status: req.Status,
AllowedGroups: req.AllowedGroups,
GroupRates: req.GroupRates,
SoraStorageQuotaBytes: req.SoraStorageQuotaBytes,
})
if err != nil {
response.ErrorFrom(c, err)

View File

@@ -59,11 +59,9 @@ func UserFromServiceAdmin(u *service.User) *AdminUser {
return nil
}
return &AdminUser{
User: *base,
Notes: u.Notes,
GroupRates: u.GroupRates,
SoraStorageQuotaBytes: u.SoraStorageQuotaBytes,
SoraStorageUsedBytes: u.SoraStorageUsedBytes,
User: *base,
Notes: u.Notes,
GroupRates: u.GroupRates,
}
}

View File

@@ -31,10 +31,6 @@ type AdminUser struct {
// GroupRates 用户专属分组倍率配置
// map[groupID]rateMultiplier
GroupRates map[int64]float64 `json:"group_rates,omitempty"`
// Sora 存储配额
SoraStorageQuotaBytes int64 `json:"sora_storage_quota_bytes"`
SoraStorageUsedBytes int64 `json:"sora_storage_used_bytes"`
}
type APIKey struct {

View File

@@ -1424,11 +1424,10 @@ func TestGenerateRequest_JSONSerialize_IncludesAPIKeyID(t *testing.T) {
func TestGetQuota_WithQuotaService_Success(t *testing.T) {
userRepo := newStubUserRepoForHandler()
userRepo.users[1] = &service.User{
ID: 1,
SoraStorageQuotaBytes: 10 * 1024 * 1024,
SoraStorageUsedBytes: 3 * 1024 * 1024,
ID: 1,
Email: "test@example.com",
}
quotaService := service.NewSoraQuotaService(userRepo, nil, nil)
quotaService := service.NewSoraQuotaService(nil)
repo := newStubSoraGenRepo()
genService := service.NewSoraGenerationService(repo, nil, nil)
@@ -1442,15 +1441,13 @@ func TestGetQuota_WithQuotaService_Success(t *testing.T) {
require.Equal(t, http.StatusOK, rec.Code)
resp := parseResponse(t, rec)
data := resp["data"].(map[string]any)
require.Equal(t, "user", data["source"])
require.Equal(t, float64(10*1024*1024), data["quota_bytes"])
require.Equal(t, float64(3*1024*1024), data["used_bytes"])
require.Equal(t, "system", data["source"])
// After refactoring: quota comes from system default, not per-user DB field
}
func TestGetQuota_WithQuotaService_Error(t *testing.T) {
// 用户不存在时 GetQuota 返回错误
userRepo := newStubUserRepoForHandler()
quotaService := service.NewSoraQuotaService(userRepo, nil, nil)
quotaService := service.NewSoraQuotaService(nil)
repo := newStubSoraGenRepo()
genService := service.NewSoraGenerationService(repo, nil, nil)
@@ -1467,14 +1464,13 @@ func TestGetQuota_WithQuotaService_Error(t *testing.T) {
// ==================== Generate: 配额检查 ====================
func TestGenerate_QuotaCheckFailed(t *testing.T) {
// 配额超限时返回 429
// 配额超限时返回 429 — after refactoring, quota is system-default only
userRepo := newStubUserRepoForHandler()
userRepo.users[1] = &service.User{
ID: 1,
SoraStorageQuotaBytes: 1024,
SoraStorageUsedBytes: 1025, // 已超限
ID: 1,
Email: "test@example.com",
}
quotaService := service.NewSoraQuotaService(userRepo, nil, nil)
quotaService := service.NewSoraQuotaService(nil)
repo := newStubSoraGenRepo()
genService := service.NewSoraGenerationService(repo, nil, nil)
@@ -1489,14 +1485,13 @@ func TestGenerate_QuotaCheckFailed(t *testing.T) {
}
func TestGenerate_QuotaCheckPassed(t *testing.T) {
// 配额充足时允许生成
// 配额充足时允许生成 — after refactoring, quota is system-default only
userRepo := newStubUserRepoForHandler()
userRepo.users[1] = &service.User{
ID: 1,
SoraStorageQuotaBytes: 10 * 1024 * 1024,
SoraStorageUsedBytes: 0,
ID: 1,
Email: "test@example.com",
}
quotaService := service.NewSoraQuotaService(userRepo, nil, nil)
quotaService := service.NewSoraQuotaService(nil)
repo := newStubSoraGenRepo()
genService := service.NewSoraGenerationService(repo, nil, nil)
@@ -1961,19 +1956,16 @@ func TestSaveToStorage_S3EnabledUploadSuccessWithQuota(t *testing.T) {
userRepo := newStubUserRepoForHandler()
userRepo.users[1] = &service.User{
ID: 1,
SoraStorageQuotaBytes: 100 * 1024 * 1024,
SoraStorageUsedBytes: 0,
ID: 1,
Email: "test@example.com",
}
quotaService := service.NewSoraQuotaService(userRepo, nil, nil)
quotaService := service.NewSoraQuotaService(nil)
h := &SoraClientHandler{genService: genService, s3Storage: s3Storage, quotaService: quotaService}
c, rec := makeGinContext("POST", "/api/v1/sora/generations/1/save", "", 1)
c.Params = gin.Params{{Key: "id", Value: "1"}}
h.SaveToStorage(c)
require.Equal(t, http.StatusOK, rec.Code)
// 验证配额已累加
require.Greater(t, userRepo.users[1].SoraStorageUsedBytes, int64(0))
}
func TestSaveToStorage_S3UploadSuccessMarkCompletedFails(t *testing.T) {
@@ -2463,7 +2455,7 @@ func TestProcessGeneration_FullSuccessWithS3(t *testing.T) {
userRepo.users[1] = &service.User{
ID: 1, SoraStorageQuotaBytes: 100 * 1024 * 1024,
}
quotaService := service.NewSoraQuotaService(userRepo, nil, nil)
quotaService := service.NewSoraQuotaService(nil)
h := &SoraClientHandler{
genService: genService,
@@ -2923,7 +2915,7 @@ func TestGenerate_CheckQuotaNonQuotaError(t *testing.T) {
// 用户不存在 → GetByID 失败 → CheckQuota 返回普通 error
userRepo := newStubUserRepoForHandler()
quotaService := service.NewSoraQuotaService(userRepo, nil, nil)
quotaService := service.NewSoraQuotaService(nil)
h := NewSoraClientHandler(genService, quotaService, nil, nil, nil, nil, nil)
@@ -2988,7 +2980,7 @@ func TestSaveToStorage_QuotaExceeded(t *testing.T) {
SoraStorageQuotaBytes: 10,
SoraStorageUsedBytes: 10,
}
quotaService := service.NewSoraQuotaService(userRepo, nil, nil)
quotaService := service.NewSoraQuotaService(nil)
h := &SoraClientHandler{genService: genService, s3Storage: s3Storage, quotaService: quotaService}
c, rec := makeGinContext("POST", "/api/v1/sora/generations/1/save", "", 1)
@@ -3016,7 +3008,7 @@ func TestSaveToStorage_QuotaNonQuotaError(t *testing.T) {
// 用户不存在 → GetByID 失败 → AddUsage 返回普通 error
userRepo := newStubUserRepoForHandler()
quotaService := service.NewSoraQuotaService(userRepo, nil, nil)
quotaService := service.NewSoraQuotaService(nil)
h := &SoraClientHandler{genService: genService, s3Storage: s3Storage, quotaService: quotaService}
c, rec := makeGinContext("POST", "/api/v1/sora/generations/1/save", "", 1)
@@ -3099,7 +3091,7 @@ func TestSaveToStorage_MarkCompletedFailsWithQuotaRollback(t *testing.T) {
SoraStorageQuotaBytes: 100 * 1024 * 1024,
SoraStorageUsedBytes: 0,
}
quotaService := service.NewSoraQuotaService(userRepo, nil, nil)
quotaService := service.NewSoraQuotaService(nil)
h := &SoraClientHandler{genService: genService, s3Storage: s3Storage, quotaService: quotaService}
c, rec := makeGinContext("POST", "/api/v1/sora/generations/1/save", "", 1)