31cde6c555
- 用户侧 UserSubscription DTO 移除 assigned_by/assigned_at/notes/assigned_by_user 等管理员字段\n- 新增 AdminUserSubscription，并调整管理员订阅接口与批量分配结果使用\n- 增加 /api/v1/subscriptions 契约测试，确保用户侧响应不包含上述字段
532 lines
14 KiB
Go
532 lines
14 KiB
Go
// Package dto provides data transfer objects for HTTP handlers.
|
||
package dto
|
||
|
||
import (
|
||
"time"
|
||
|
||
"github.com/Wei-Shaw/sub2api/internal/service"
|
||
)
|
||
|
||
func UserFromServiceShallow(u *service.User) *User {
|
||
if u == nil {
|
||
return nil
|
||
}
|
||
return &User{
|
||
ID: u.ID,
|
||
Email: u.Email,
|
||
Username: u.Username,
|
||
Role: u.Role,
|
||
Balance: u.Balance,
|
||
Concurrency: u.Concurrency,
|
||
Status: u.Status,
|
||
AllowedGroups: u.AllowedGroups,
|
||
CreatedAt: u.CreatedAt,
|
||
UpdatedAt: u.UpdatedAt,
|
||
}
|
||
}
|
||
|
||
func UserFromService(u *service.User) *User {
|
||
if u == nil {
|
||
return nil
|
||
}
|
||
out := UserFromServiceShallow(u)
|
||
if len(u.APIKeys) > 0 {
|
||
out.APIKeys = make([]APIKey, 0, len(u.APIKeys))
|
||
for i := range u.APIKeys {
|
||
k := u.APIKeys[i]
|
||
out.APIKeys = append(out.APIKeys, *APIKeyFromService(&k))
|
||
}
|
||
}
|
||
if len(u.Subscriptions) > 0 {
|
||
out.Subscriptions = make([]UserSubscription, 0, len(u.Subscriptions))
|
||
for i := range u.Subscriptions {
|
||
s := u.Subscriptions[i]
|
||
out.Subscriptions = append(out.Subscriptions, *UserSubscriptionFromService(&s))
|
||
}
|
||
}
|
||
return out
|
||
}
|
||
|
||
// UserFromServiceAdmin converts a service User to DTO for admin users.
|
||
// It includes notes - user-facing endpoints must not use this.
|
||
func UserFromServiceAdmin(u *service.User) *AdminUser {
|
||
if u == nil {
|
||
return nil
|
||
}
|
||
base := UserFromService(u)
|
||
if base == nil {
|
||
return nil
|
||
}
|
||
return &AdminUser{
|
||
User: *base,
|
||
Notes: u.Notes,
|
||
}
|
||
}
|
||
|
||
func APIKeyFromService(k *service.APIKey) *APIKey {
|
||
if k == nil {
|
||
return nil
|
||
}
|
||
return &APIKey{
|
||
ID: k.ID,
|
||
UserID: k.UserID,
|
||
Key: k.Key,
|
||
Name: k.Name,
|
||
GroupID: k.GroupID,
|
||
Status: k.Status,
|
||
IPWhitelist: k.IPWhitelist,
|
||
IPBlacklist: k.IPBlacklist,
|
||
CreatedAt: k.CreatedAt,
|
||
UpdatedAt: k.UpdatedAt,
|
||
User: UserFromServiceShallow(k.User),
|
||
Group: GroupFromServiceShallow(k.Group),
|
||
}
|
||
}
|
||
|
||
func GroupFromServiceShallow(g *service.Group) *Group {
|
||
if g == nil {
|
||
return nil
|
||
}
|
||
out := groupFromServiceBase(g)
|
||
return &out
|
||
}
|
||
|
||
func GroupFromService(g *service.Group) *Group {
|
||
if g == nil {
|
||
return nil
|
||
}
|
||
return GroupFromServiceShallow(g)
|
||
}
|
||
|
||
// GroupFromServiceAdmin converts a service Group to DTO for admin users.
|
||
// It includes internal fields like model_routing and account_count.
|
||
func GroupFromServiceAdmin(g *service.Group) *AdminGroup {
|
||
if g == nil {
|
||
return nil
|
||
}
|
||
out := &AdminGroup{
|
||
Group: groupFromServiceBase(g),
|
||
ModelRouting: g.ModelRouting,
|
||
ModelRoutingEnabled: g.ModelRoutingEnabled,
|
||
AccountCount: g.AccountCount,
|
||
}
|
||
if len(g.AccountGroups) > 0 {
|
||
out.AccountGroups = make([]AccountGroup, 0, len(g.AccountGroups))
|
||
for i := range g.AccountGroups {
|
||
ag := g.AccountGroups[i]
|
||
out.AccountGroups = append(out.AccountGroups, *AccountGroupFromService(&ag))
|
||
}
|
||
}
|
||
return out
|
||
}
|
||
|
||
func groupFromServiceBase(g *service.Group) Group {
|
||
return Group{
|
||
ID: g.ID,
|
||
Name: g.Name,
|
||
Description: g.Description,
|
||
Platform: g.Platform,
|
||
RateMultiplier: g.RateMultiplier,
|
||
IsExclusive: g.IsExclusive,
|
||
Status: g.Status,
|
||
SubscriptionType: g.SubscriptionType,
|
||
DailyLimitUSD: g.DailyLimitUSD,
|
||
WeeklyLimitUSD: g.WeeklyLimitUSD,
|
||
MonthlyLimitUSD: g.MonthlyLimitUSD,
|
||
ImagePrice1K: g.ImagePrice1K,
|
||
ImagePrice2K: g.ImagePrice2K,
|
||
ImagePrice4K: g.ImagePrice4K,
|
||
ClaudeCodeOnly: g.ClaudeCodeOnly,
|
||
FallbackGroupID: g.FallbackGroupID,
|
||
CreatedAt: g.CreatedAt,
|
||
UpdatedAt: g.UpdatedAt,
|
||
}
|
||
}
|
||
|
||
func AccountFromServiceShallow(a *service.Account) *Account {
|
||
if a == nil {
|
||
return nil
|
||
}
|
||
out := &Account{
|
||
ID: a.ID,
|
||
Name: a.Name,
|
||
Notes: a.Notes,
|
||
Platform: a.Platform,
|
||
Type: a.Type,
|
||
Credentials: a.Credentials,
|
||
Extra: a.Extra,
|
||
ProxyID: a.ProxyID,
|
||
Concurrency: a.Concurrency,
|
||
Priority: a.Priority,
|
||
RateMultiplier: a.BillingRateMultiplier(),
|
||
Status: a.Status,
|
||
ErrorMessage: a.ErrorMessage,
|
||
LastUsedAt: a.LastUsedAt,
|
||
ExpiresAt: timeToUnixSeconds(a.ExpiresAt),
|
||
AutoPauseOnExpired: a.AutoPauseOnExpired,
|
||
CreatedAt: a.CreatedAt,
|
||
UpdatedAt: a.UpdatedAt,
|
||
Schedulable: a.Schedulable,
|
||
RateLimitedAt: a.RateLimitedAt,
|
||
RateLimitResetAt: a.RateLimitResetAt,
|
||
OverloadUntil: a.OverloadUntil,
|
||
TempUnschedulableUntil: a.TempUnschedulableUntil,
|
||
TempUnschedulableReason: a.TempUnschedulableReason,
|
||
SessionWindowStart: a.SessionWindowStart,
|
||
SessionWindowEnd: a.SessionWindowEnd,
|
||
SessionWindowStatus: a.SessionWindowStatus,
|
||
GroupIDs: a.GroupIDs,
|
||
}
|
||
|
||
// 提取 5h 窗口费用控制和会话数量控制配置（仅 Anthropic OAuth/SetupToken 账号有效）
|
||
if a.IsAnthropicOAuthOrSetupToken() {
|
||
if limit := a.GetWindowCostLimit(); limit > 0 {
|
||
out.WindowCostLimit = &limit
|
||
}
|
||
if reserve := a.GetWindowCostStickyReserve(); reserve > 0 {
|
||
out.WindowCostStickyReserve = &reserve
|
||
}
|
||
if maxSessions := a.GetMaxSessions(); maxSessions > 0 {
|
||
out.MaxSessions = &maxSessions
|
||
}
|
||
if idleTimeout := a.GetSessionIdleTimeoutMinutes(); idleTimeout > 0 {
|
||
out.SessionIdleTimeoutMin = &idleTimeout
|
||
}
|
||
// TLS指纹伪装开关
|
||
if a.IsTLSFingerprintEnabled() {
|
||
enabled := true
|
||
out.EnableTLSFingerprint = &enabled
|
||
}
|
||
// 会话ID伪装开关
|
||
if a.IsSessionIDMaskingEnabled() {
|
||
enabled := true
|
||
out.EnableSessionIDMasking = &enabled
|
||
}
|
||
}
|
||
|
||
return out
|
||
}
|
||
|
||
func AccountFromService(a *service.Account) *Account {
|
||
if a == nil {
|
||
return nil
|
||
}
|
||
out := AccountFromServiceShallow(a)
|
||
out.Proxy = ProxyFromService(a.Proxy)
|
||
if len(a.AccountGroups) > 0 {
|
||
out.AccountGroups = make([]AccountGroup, 0, len(a.AccountGroups))
|
||
for i := range a.AccountGroups {
|
||
ag := a.AccountGroups[i]
|
||
out.AccountGroups = append(out.AccountGroups, *AccountGroupFromService(&ag))
|
||
}
|
||
}
|
||
if len(a.Groups) > 0 {
|
||
out.Groups = make([]*Group, 0, len(a.Groups))
|
||
for _, g := range a.Groups {
|
||
out.Groups = append(out.Groups, GroupFromServiceShallow(g))
|
||
}
|
||
}
|
||
return out
|
||
}
|
||
|
||
func timeToUnixSeconds(value *time.Time) *int64 {
|
||
if value == nil {
|
||
return nil
|
||
}
|
||
ts := value.Unix()
|
||
return &ts
|
||
}
|
||
|
||
func AccountGroupFromService(ag *service.AccountGroup) *AccountGroup {
|
||
if ag == nil {
|
||
return nil
|
||
}
|
||
return &AccountGroup{
|
||
AccountID: ag.AccountID,
|
||
GroupID: ag.GroupID,
|
||
Priority: ag.Priority,
|
||
CreatedAt: ag.CreatedAt,
|
||
Account: AccountFromServiceShallow(ag.Account),
|
||
Group: GroupFromServiceShallow(ag.Group),
|
||
}
|
||
}
|
||
|
||
func ProxyFromService(p *service.Proxy) *Proxy {
|
||
if p == nil {
|
||
return nil
|
||
}
|
||
return &Proxy{
|
||
ID: p.ID,
|
||
Name: p.Name,
|
||
Protocol: p.Protocol,
|
||
Host: p.Host,
|
||
Port: p.Port,
|
||
Username: p.Username,
|
||
Password: p.Password,
|
||
Status: p.Status,
|
||
CreatedAt: p.CreatedAt,
|
||
UpdatedAt: p.UpdatedAt,
|
||
}
|
||
}
|
||
|
||
func ProxyWithAccountCountFromService(p *service.ProxyWithAccountCount) *ProxyWithAccountCount {
|
||
if p == nil {
|
||
return nil
|
||
}
|
||
return &ProxyWithAccountCount{
|
||
Proxy: *ProxyFromService(&p.Proxy),
|
||
AccountCount: p.AccountCount,
|
||
LatencyMs: p.LatencyMs,
|
||
LatencyStatus: p.LatencyStatus,
|
||
LatencyMessage: p.LatencyMessage,
|
||
IPAddress: p.IPAddress,
|
||
Country: p.Country,
|
||
CountryCode: p.CountryCode,
|
||
Region: p.Region,
|
||
City: p.City,
|
||
}
|
||
}
|
||
|
||
func ProxyAccountSummaryFromService(a *service.ProxyAccountSummary) *ProxyAccountSummary {
|
||
if a == nil {
|
||
return nil
|
||
}
|
||
return &ProxyAccountSummary{
|
||
ID: a.ID,
|
||
Name: a.Name,
|
||
Platform: a.Platform,
|
||
Type: a.Type,
|
||
Notes: a.Notes,
|
||
}
|
||
}
|
||
|
||
func RedeemCodeFromService(rc *service.RedeemCode) *RedeemCode {
|
||
if rc == nil {
|
||
return nil
|
||
}
|
||
return &RedeemCode{
|
||
ID: rc.ID,
|
||
Code: rc.Code,
|
||
Type: rc.Type,
|
||
Value: rc.Value,
|
||
Status: rc.Status,
|
||
UsedBy: rc.UsedBy,
|
||
UsedAt: rc.UsedAt,
|
||
Notes: rc.Notes,
|
||
CreatedAt: rc.CreatedAt,
|
||
GroupID: rc.GroupID,
|
||
ValidityDays: rc.ValidityDays,
|
||
User: UserFromServiceShallow(rc.User),
|
||
Group: GroupFromServiceShallow(rc.Group),
|
||
}
|
||
}
|
||
|
||
// AccountSummaryFromService returns a minimal AccountSummary for usage log display.
|
||
// Only includes ID and Name - no sensitive fields like Credentials, Proxy, etc.
|
||
func AccountSummaryFromService(a *service.Account) *AccountSummary {
|
||
if a == nil {
|
||
return nil
|
||
}
|
||
return &AccountSummary{
|
||
ID: a.ID,
|
||
Name: a.Name,
|
||
}
|
||
}
|
||
|
||
func usageLogFromServiceUser(l *service.UsageLog) UsageLog {
|
||
// 普通用户 DTO：严禁包含管理员字段（例如 account_rate_multiplier、ip_address、account）。
|
||
return UsageLog{
|
||
ID: l.ID,
|
||
UserID: l.UserID,
|
||
APIKeyID: l.APIKeyID,
|
||
AccountID: l.AccountID,
|
||
RequestID: l.RequestID,
|
||
Model: l.Model,
|
||
GroupID: l.GroupID,
|
||
SubscriptionID: l.SubscriptionID,
|
||
InputTokens: l.InputTokens,
|
||
OutputTokens: l.OutputTokens,
|
||
CacheCreationTokens: l.CacheCreationTokens,
|
||
CacheReadTokens: l.CacheReadTokens,
|
||
CacheCreation5mTokens: l.CacheCreation5mTokens,
|
||
CacheCreation1hTokens: l.CacheCreation1hTokens,
|
||
InputCost: l.InputCost,
|
||
OutputCost: l.OutputCost,
|
||
CacheCreationCost: l.CacheCreationCost,
|
||
CacheReadCost: l.CacheReadCost,
|
||
TotalCost: l.TotalCost,
|
||
ActualCost: l.ActualCost,
|
||
RateMultiplier: l.RateMultiplier,
|
||
BillingType: l.BillingType,
|
||
Stream: l.Stream,
|
||
DurationMs: l.DurationMs,
|
||
FirstTokenMs: l.FirstTokenMs,
|
||
ImageCount: l.ImageCount,
|
||
ImageSize: l.ImageSize,
|
||
UserAgent: l.UserAgent,
|
||
CreatedAt: l.CreatedAt,
|
||
User: UserFromServiceShallow(l.User),
|
||
APIKey: APIKeyFromService(l.APIKey),
|
||
Group: GroupFromServiceShallow(l.Group),
|
||
Subscription: UserSubscriptionFromService(l.Subscription),
|
||
}
|
||
}
|
||
|
||
// UsageLogFromService converts a service UsageLog to DTO for regular users.
|
||
// It excludes Account details and IP address - users should not see these.
|
||
func UsageLogFromService(l *service.UsageLog) *UsageLog {
|
||
if l == nil {
|
||
return nil
|
||
}
|
||
u := usageLogFromServiceUser(l)
|
||
return &u
|
||
}
|
||
|
||
// UsageLogFromServiceAdmin converts a service UsageLog to DTO for admin users.
|
||
// It includes minimal Account info (ID, Name only) and IP address.
|
||
func UsageLogFromServiceAdmin(l *service.UsageLog) *AdminUsageLog {
|
||
if l == nil {
|
||
return nil
|
||
}
|
||
return &AdminUsageLog{
|
||
UsageLog: usageLogFromServiceUser(l),
|
||
AccountRateMultiplier: l.AccountRateMultiplier,
|
||
IPAddress: l.IPAddress,
|
||
Account: AccountSummaryFromService(l.Account),
|
||
}
|
||
}
|
||
|
||
func UsageCleanupTaskFromService(task *service.UsageCleanupTask) *UsageCleanupTask {
|
||
if task == nil {
|
||
return nil
|
||
}
|
||
return &UsageCleanupTask{
|
||
ID: task.ID,
|
||
Status: task.Status,
|
||
Filters: UsageCleanupFilters{
|
||
StartTime: task.Filters.StartTime,
|
||
EndTime: task.Filters.EndTime,
|
||
UserID: task.Filters.UserID,
|
||
APIKeyID: task.Filters.APIKeyID,
|
||
AccountID: task.Filters.AccountID,
|
||
GroupID: task.Filters.GroupID,
|
||
Model: task.Filters.Model,
|
||
Stream: task.Filters.Stream,
|
||
BillingType: task.Filters.BillingType,
|
||
},
|
||
CreatedBy: task.CreatedBy,
|
||
DeletedRows: task.DeletedRows,
|
||
ErrorMessage: task.ErrorMsg,
|
||
CanceledBy: task.CanceledBy,
|
||
CanceledAt: task.CanceledAt,
|
||
StartedAt: task.StartedAt,
|
||
FinishedAt: task.FinishedAt,
|
||
CreatedAt: task.CreatedAt,
|
||
UpdatedAt: task.UpdatedAt,
|
||
}
|
||
}
|
||
|
||
func SettingFromService(s *service.Setting) *Setting {
|
||
if s == nil {
|
||
return nil
|
||
}
|
||
return &Setting{
|
||
ID: s.ID,
|
||
Key: s.Key,
|
||
Value: s.Value,
|
||
UpdatedAt: s.UpdatedAt,
|
||
}
|
||
}
|
||
|
||
func UserSubscriptionFromService(sub *service.UserSubscription) *UserSubscription {
|
||
if sub == nil {
|
||
return nil
|
||
}
|
||
out := userSubscriptionFromServiceBase(sub)
|
||
return &out
|
||
}
|
||
|
||
// UserSubscriptionFromServiceAdmin converts a service UserSubscription to DTO for admin users.
|
||
// It includes assignment metadata and notes.
|
||
func UserSubscriptionFromServiceAdmin(sub *service.UserSubscription) *AdminUserSubscription {
|
||
if sub == nil {
|
||
return nil
|
||
}
|
||
return &AdminUserSubscription{
|
||
UserSubscription: userSubscriptionFromServiceBase(sub),
|
||
AssignedBy: sub.AssignedBy,
|
||
AssignedAt: sub.AssignedAt,
|
||
Notes: sub.Notes,
|
||
AssignedByUser: UserFromServiceShallow(sub.AssignedByUser),
|
||
}
|
||
}
|
||
|
||
func userSubscriptionFromServiceBase(sub *service.UserSubscription) UserSubscription {
|
||
return UserSubscription{
|
||
ID: sub.ID,
|
||
UserID: sub.UserID,
|
||
GroupID: sub.GroupID,
|
||
StartsAt: sub.StartsAt,
|
||
ExpiresAt: sub.ExpiresAt,
|
||
Status: sub.Status,
|
||
DailyWindowStart: sub.DailyWindowStart,
|
||
WeeklyWindowStart: sub.WeeklyWindowStart,
|
||
MonthlyWindowStart: sub.MonthlyWindowStart,
|
||
DailyUsageUSD: sub.DailyUsageUSD,
|
||
WeeklyUsageUSD: sub.WeeklyUsageUSD,
|
||
MonthlyUsageUSD: sub.MonthlyUsageUSD,
|
||
CreatedAt: sub.CreatedAt,
|
||
UpdatedAt: sub.UpdatedAt,
|
||
User: UserFromServiceShallow(sub.User),
|
||
Group: GroupFromServiceShallow(sub.Group),
|
||
}
|
||
}
|
||
|
||
func BulkAssignResultFromService(r *service.BulkAssignResult) *BulkAssignResult {
|
||
if r == nil {
|
||
return nil
|
||
}
|
||
subs := make([]AdminUserSubscription, 0, len(r.Subscriptions))
|
||
for i := range r.Subscriptions {
|
||
subs = append(subs, *UserSubscriptionFromServiceAdmin(&r.Subscriptions[i]))
|
||
}
|
||
return &BulkAssignResult{
|
||
SuccessCount: r.SuccessCount,
|
||
FailedCount: r.FailedCount,
|
||
Subscriptions: subs,
|
||
Errors: r.Errors,
|
||
}
|
||
}
|
||
|
||
func PromoCodeFromService(pc *service.PromoCode) *PromoCode {
|
||
if pc == nil {
|
||
return nil
|
||
}
|
||
return &PromoCode{
|
||
ID: pc.ID,
|
||
Code: pc.Code,
|
||
BonusAmount: pc.BonusAmount,
|
||
MaxUses: pc.MaxUses,
|
||
UsedCount: pc.UsedCount,
|
||
Status: pc.Status,
|
||
ExpiresAt: pc.ExpiresAt,
|
||
Notes: pc.Notes,
|
||
CreatedAt: pc.CreatedAt,
|
||
UpdatedAt: pc.UpdatedAt,
|
||
}
|
||
}
|
||
|
||
func PromoCodeUsageFromService(u *service.PromoCodeUsage) *PromoCodeUsage {
|
||
if u == nil {
|
||
return nil
|
||
}
|
||
return &PromoCodeUsage{
|
||
ID: u.ID,
|
||
PromoCodeID: u.PromoCodeID,
|
||
UserID: u.UserID,
|
||
BonusAmount: u.BonusAmount,
|
||
UsedAt: u.UsedAt,
|
||
User: UserFromServiceShallow(u.User),
|
||
}
|
||
}
|