diff --git a/backend/internal/db/db.go b/backend/internal/db/db.go index 23593eb..5964de2 100644 --- a/backend/internal/db/db.go +++ b/backend/internal/db/db.go @@ -1,36 +1,42 @@ -package db - -import ( - "feedsystem_video_go/internal/account" - "feedsystem_video_go/internal/config" - "feedsystem_video_go/internal/social" - "feedsystem_video_go/internal/video" - "fmt" - - "gorm.io/driver/mysql" - "gorm.io/gorm" -) - -func NewDB(dbcfg config.DatabaseConfig) (*gorm.DB, error) { - dsn := fmt.Sprintf("%s:%s@tcp(%s:%d)/%s?charset=utf8mb4&parseTime=True&loc=Local", - dbcfg.User, dbcfg.Password, dbcfg.Host, dbcfg.Port, dbcfg.DBName) - - db, err := gorm.Open(mysql.Open(dsn), &gorm.Config{}) - if err != nil { - return nil, err - } - - return db, nil -} - -func AutoMigrate(db *gorm.DB) error { - return db.AutoMigrate(&account.Account{}, &video.Video{}, &video.Like{}, &video.Comment{}, &social.Social{}, &video.OutboxMsg{}) -} - -func CloseDB(db *gorm.DB) error { - sqlDB, err := db.DB() - if err != nil { - return err - } - return sqlDB.Close() -} +package db + +import ( + "feedsystem_video_go/internal/account" + "feedsystem_video_go/internal/config" + "feedsystem_video_go/internal/message" + "feedsystem_video_go/internal/social" + "feedsystem_video_go/internal/video" + "feedsystem_video_go/internal/worker" + "fmt" + + "gorm.io/driver/mysql" + "gorm.io/gorm" +) + +func NewDB(dbcfg config.DatabaseConfig) (*gorm.DB, error) { + dsn := fmt.Sprintf("%s:%s@tcp(%s:%d)/%s?charset=utf8mb4&parseTime=True&loc=Local", + dbcfg.User, dbcfg.Password, dbcfg.Host, dbcfg.Port, dbcfg.DBName) + + db, err := gorm.Open(mysql.Open(dsn), &gorm.Config{}) + if err != nil { + return nil, err + } + + return db, nil +} + +func AutoMigrate(db *gorm.DB) error { + return db.AutoMigrate( + &account.Account{}, &video.Video{}, &video.Like{}, &video.Comment{}, + &social.Social{}, &video.OutboxMsg{}, &video.Tag{}, &video.VideoTag{}, + &message.Message{}, &worker.Notification{}, + ) +} + +func CloseDB(db *gorm.DB) error { + sqlDB, err := db.DB() + if err != nil { + return err + } + return sqlDB.Close() +} diff --git a/backend/internal/http/router.go b/backend/internal/http/router.go index 8decf12..50c86e8 100644 --- a/backend/internal/http/router.go +++ b/backend/internal/http/router.go @@ -176,7 +176,6 @@ func SetRouter(db *gorm.DB, cache *rediscache.Client, rmq *rabbitmq.RabbitMQ) *g } // message messageRepo := message.NewRepository(db) - _ = messageRepo.AutoMigrate(context.Background()) messageService := message.NewService(messageRepo) messageHandler := message.NewHandler(messageService) messageGroup := r.Group("/message")