refactor(数据库): 迁移持久层到 Ent 并清理 GORM
将仓储层/基础设施改为 Ent + 原生 SQL 执行路径，并移除 AutoMigrate 与 GORM 依赖。 重构内容包括： - 仓储层改用 Ent/SQL（含 usage_log/account 等复杂查询），统一错误映射 - 基础设施与 setup 初始化切换为 Ent + SQL migrations - 集成测试与 fixtures 迁移到 Ent 事务模型 - 清理遗留 GORM 模型/依赖，补充迁移与文档说明 - 增加根目录 Makefile 便于前后端编译 测试： - go test -tags unit ./... - go test -tags integration ./...
This commit is contained in:
yangjianbo
@@ -3,6 +3,7 @@ package setup
|
||||
import (
|
||||
"context"
|
||||
"crypto/rand"
|
||||
"database/sql"
|
||||
"encoding/hex"
|
||||
"fmt"
|
||||
"log"
|
||||
@@ -10,13 +11,12 @@ import (
|
||||
"strconv"
|
||||
"time"
|
||||
|
||||
"github.com/Wei-Shaw/sub2api/internal/repository"
|
||||
"github.com/Wei-Shaw/sub2api/internal/infrastructure"
|
||||
"github.com/Wei-Shaw/sub2api/internal/service"
|
||||
|
||||
_ "github.com/lib/pq"
|
||||
"github.com/redis/go-redis/v9"
|
||||
"gopkg.in/yaml.v3"
|
||||
"gorm.io/driver/postgres"
|
||||
"gorm.io/gorm"
|
||||
)
|
||||
|
||||
// Config paths
|
||||
@@ -92,20 +92,16 @@ func TestDatabaseConnection(cfg *DatabaseConfig) error {
|
||||
cfg.Host, cfg.Port, cfg.User, cfg.Password, cfg.SSLMode,
|
||||
)
|
||||
|
||||
db, err := gorm.Open(postgres.Open(defaultDSN), &gorm.Config{})
|
||||
db, err := sql.Open("postgres", defaultDSN)
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to connect to PostgreSQL: %w", err)
|
||||
}
|
||||
|
||||
sqlDB, err := db.DB()
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to get db instance: %w", err)
|
||||
}
|
||||
defer func() {
|
||||
if sqlDB == nil {
|
||||
if db == nil {
|
||||
return
|
||||
}
|
||||
if err := sqlDB.Close(); err != nil {
|
||||
if err := db.Close(); err != nil {
|
||||
log.Printf("failed to close postgres connection: %v", err)
|
||||
}
|
||||
}()
|
||||
@@ -113,22 +109,23 @@ func TestDatabaseConnection(cfg *DatabaseConfig) error {
|
||||
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
|
||||
defer cancel()
|
||||
|
||||
if err := sqlDB.PingContext(ctx); err != nil {
|
||||
if err := db.PingContext(ctx); err != nil {
|
||||
return fmt.Errorf("ping failed: %w", err)
|
||||
}
|
||||
|
||||
// Check if target database exists
|
||||
var exists bool
|
||||
row := sqlDB.QueryRowContext(ctx, "SELECT EXISTS(SELECT 1 FROM pg_database WHERE datname = $1)", cfg.DBName)
|
||||
row := db.QueryRowContext(ctx, "SELECT EXISTS(SELECT 1 FROM pg_database WHERE datname = $1)", cfg.DBName)
|
||||
if err := row.Scan(&exists); err != nil {
|
||||
return fmt.Errorf("failed to check database existence: %w", err)
|
||||
}
|
||||
|
||||
// Create database if not exists
|
||||
if !exists {
|
||||
// 注意：数据库名不能参数化，依赖前置输入校验保障安全。
|
||||
// Note: Database names cannot be parameterized, but we've already validated cfg.DBName
|
||||
// in the handler using validateDBName() which only allows [a-zA-Z][a-zA-Z0-9_]*
|
||||
_, err := sqlDB.ExecContext(ctx, fmt.Sprintf("CREATE DATABASE %s", cfg.DBName))
|
||||
_, err := db.ExecContext(ctx, fmt.Sprintf("CREATE DATABASE %s", cfg.DBName))
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to create database '%s': %w", cfg.DBName, err)
|
||||
}
|
||||
@@ -136,27 +133,23 @@ func TestDatabaseConnection(cfg *DatabaseConfig) error {
|
||||
}
|
||||
|
||||
// Now connect to the target database to verify
|
||||
if err := sqlDB.Close(); err != nil {
|
||||
if err := db.Close(); err != nil {
|
||||
log.Printf("failed to close postgres connection: %v", err)
|
||||
}
|
||||
sqlDB = nil
|
||||
db = nil
|
||||
|
||||
targetDSN := fmt.Sprintf(
|
||||
"host=%s port=%d user=%s password=%s dbname=%s sslmode=%s",
|
||||
cfg.Host, cfg.Port, cfg.User, cfg.Password, cfg.DBName, cfg.SSLMode,
|
||||
)
|
||||
|
||||
targetDB, err := gorm.Open(postgres.Open(targetDSN), &gorm.Config{})
|
||||
targetDB, err := sql.Open("postgres", targetDSN)
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to connect to database '%s': %w", cfg.DBName, err)
|
||||
}
|
||||
|
||||
targetSqlDB, err := targetDB.DB()
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to get target db instance: %w", err)
|
||||
}
|
||||
defer func() {
|
||||
if err := targetSqlDB.Close(); err != nil {
|
||||
if err := targetDB.Close(); err != nil {
|
||||
log.Printf("failed to close postgres connection: %v", err)
|
||||
}
|
||||
}()
|
||||
@@ -164,7 +157,7 @@ func TestDatabaseConnection(cfg *DatabaseConfig) error {
|
||||
ctx2, cancel2 := context.WithTimeout(context.Background(), 5*time.Second)
|
||||
defer cancel2()
|
||||
|
||||
if err := targetSqlDB.PingContext(ctx2); err != nil {
|
||||
if err := targetDB.PingContext(ctx2); err != nil {
|
||||
return fmt.Errorf("ping target database failed: %w", err)
|
||||
}
|
||||
|
||||
@@ -256,22 +249,18 @@ func initializeDatabase(cfg *SetupConfig) error {
|
||||
cfg.Database.Password, cfg.Database.DBName, cfg.Database.SSLMode,
|
||||
)
|
||||
|
||||
db, err := gorm.Open(postgres.Open(dsn), &gorm.Config{})
|
||||
db, err := sql.Open("postgres", dsn)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
sqlDB, err := db.DB()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
defer func() {
|
||||
if err := sqlDB.Close(); err != nil {
|
||||
if err := db.Close(); err != nil {
|
||||
log.Printf("failed to close postgres connection: %v", err)
|
||||
}
|
||||
}()
|
||||
|
||||
return repository.AutoMigrate(db)
|
||||
return infrastructure.ApplyMigrations(context.Background(), db)
|
||||
}
|
||||
|
||||
func createAdminUser(cfg *SetupConfig) error {
|
||||
@@ -281,24 +270,24 @@ func createAdminUser(cfg *SetupConfig) error {
|
||||
cfg.Database.Password, cfg.Database.DBName, cfg.Database.SSLMode,
|
||||
)
|
||||
|
||||
db, err := gorm.Open(postgres.Open(dsn), &gorm.Config{})
|
||||
db, err := sql.Open("postgres", dsn)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
sqlDB, err := db.DB()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
defer func() {
|
||||
if err := sqlDB.Close(); err != nil {
|
||||
if err := db.Close(); err != nil {
|
||||
log.Printf("failed to close postgres connection: %v", err)
|
||||
}
|
||||
}()
|
||||
|
||||
// 使用超时上下文避免安装流程因数据库异常而长时间阻塞。
|
||||
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
|
||||
defer cancel()
|
||||
|
||||
// Check if admin already exists
|
||||
var count int64
|
||||
if err := db.Table("users").Where("role = ?", service.RoleAdmin).Count(&count).Error; err != nil {
|
||||
if err := db.QueryRowContext(ctx, "SELECT COUNT(1) FROM users WHERE role = $1", service.RoleAdmin).Scan(&count); err != nil {
|
||||
return err
|
||||
}
|
||||
if count > 0 {
|
||||
@@ -319,7 +308,20 @@ func createAdminUser(cfg *SetupConfig) error {
|
||||
return err
|
||||
}
|
||||
|
||||
return repository.NewUserRepository(db).Create(context.Background(), admin)
|
||||
_, err = db.ExecContext(
|
||||
ctx,
|
||||
`INSERT INTO users (email, password_hash, role, balance, concurrency, status, created_at, updated_at)
|
||||
VALUES ($1, $2, $3, $4, $5, $6, $7, $8)`,
|
||||
admin.Email,
|
||||
admin.PasswordHash,
|
||||
admin.Role,
|
||||
admin.Balance,
|
||||
admin.Concurrency,
|
||||
admin.Status,
|
||||
admin.CreatedAt,
|
||||
admin.UpdatedAt,
|
||||
)
|
||||
return err
|
||||
}
|
||||
|
||||
func writeConfigFile(cfg *SetupConfig) error {
|
||||
@@ -339,7 +341,10 @@ func writeConfigFile(cfg *SetupConfig) error {
|
||||
ExpireHour int `yaml:"expire_hour"`
|
||||
} `yaml:"jwt"`
|
||||
Default struct {
|
||||
GroupID uint `yaml:"group_id"`
|
||||
UserConcurrency int `yaml:"user_concurrency"`
|
||||
UserBalance float64 `yaml:"user_balance"`
|
||||
ApiKeyPrefix string `yaml:"api_key_prefix"`
|
||||
RateMultiplier float64 `yaml:"rate_multiplier"`
|
||||
} `yaml:"default"`
|
||||
RateLimit struct {
|
||||
RequestsPerMinute int `yaml:"requests_per_minute"`
|
||||
@@ -358,9 +363,15 @@ func writeConfigFile(cfg *SetupConfig) error {
|
||||
ExpireHour: cfg.JWT.ExpireHour,
|
||||
},
|
||||
Default: struct {
|
||||
GroupID uint `yaml:"group_id"`
|
||||
UserConcurrency int `yaml:"user_concurrency"`
|
||||
UserBalance float64 `yaml:"user_balance"`
|
||||
ApiKeyPrefix string `yaml:"api_key_prefix"`
|
||||
RateMultiplier float64 `yaml:"rate_multiplier"`
|
||||
}{
|
||||
GroupID: 1,
|
||||
UserConcurrency: 5,
|
||||
UserBalance: 0,
|
||||
ApiKeyPrefix: "sk-",
|
||||
RateMultiplier: 1.0,
|
||||
},
|
||||
RateLimit: struct {
|
||||
RequestsPerMinute int `yaml:"requests_per_minute"`
|
||||
|
||||
Reference in New Issue
Block a user