oadmin/sub2api
1
0
Fork 0
Code Issues Pull Requests 1 Actions 3 Packages Projects Releases Wiki Activity

fix(仓储): 修复查询关闭错误并迁移集成测试

Browse Source 
修复 rows.Close 失败时的错误返回逻辑
迁移网关路由集成测试到 ent 事务基建
补齐仓储接口变更对应的测试桩方法
新增 backend/Makefile 统一测试命令
测试: GOTOOLCHAIN=go1.24.11 go test ./...
测试: golangci-lint run ./... --timeout=5m
测试: make test-integration
This commit is contained in:
yangjianbo
2025-12-30 16:41:45 +08:00
parent b6fec590a7
commit aacbc98aec
15 changed files with 123 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
backend/internal/repository/usage_log_repo.go
View File

@@ -154,7 +154,7 @@ func (r *usageLogRepository) GetByID(ctx context.Context, id int64) (*service.Us
if err != nil {
return nil, err
}
defer rows.Close()
defer func() { _ = rows.Close() }()
if !rows.Next() {
if err := rows.Err(); err != nil {
return nil, err
@@ -568,7 +568,7 @@ func (r *usageLogRepository) GetApiKeyUsageTrend(ctx context.Context, startTime,
if err != nil {
return nil, err
}
defer rows.Close()
defer func() { _ = rows.Close() }()
results := make([]ApiKeyUsageTrendPoint, 0)
for rows.Next() {
@@ -621,7 +621,7 @@ func (r *usageLogRepository) GetUserUsageTrend(ctx context.Context, startTime, e
if err != nil {
return nil, err
}
defer rows.Close()
defer func() { _ = rows.Close() }()
results := make([]UserUsageTrendPoint, 0)
for rows.Next() {
@@ -766,7 +766,7 @@ func (r *usageLogRepository) GetUserUsageTrendByUserID(ctx context.Context, user
if err != nil {
return nil, err
}
defer rows.Close()
defer func() { _ = rows.Close() }()
return scanTrendRows(rows)
}
@@ -792,7 +792,7 @@ func (r *usageLogRepository) GetUserModelStats(ctx context.Context, userID int64
if err != nil {
return nil, err
}
defer rows.Close()
defer func() { _ = rows.Close() }()
return scanModelStatsRows(rows)
}
@@ -1029,7 +1029,7 @@ func (r *usageLogRepository) GetUsageTrendWithFilters(ctx context.Context, start
if err != nil {
return nil, err
}
defer rows.Close()
defer func() { _ = rows.Close() }()
return scanTrendRows(rows)
}
@@ -1068,7 +1068,7 @@ func (r *usageLogRepository) GetModelStatsWithFilters(ctx context.Context, start
if err != nil {
return nil, err
}
defer rows.Close()
defer func() { _ = rows.Close() }()
return scanModelStatsRows(rows)
}
@@ -1141,7 +1141,7 @@ func (r *usageLogRepository) GetAccountUsageStats(ctx context.Context, accountID
if err != nil {
return nil, err
}
defer rows.Close()
defer func() { _ = rows.Close() }()
history := make([]AccountUsageHistory, 0)
for rows.Next() {
@@ -1291,7 +1291,7 @@ func (r *usageLogRepository) queryUsageLogs(ctx context.Context, query string, a
if err != nil {
return nil, err
}
defer rows.Close()
defer func() { _ = rows.Close() }()
logs := make([]service.UsageLog, 0)
for rows.Next() {