コアモデルの作成・DB接続をGORMを利用する形に変更

internal/database/database.go

@@ -1,40 +1,60 @@
+package database
+
 import (
-    "database/sql"
-    "fmt"
-    _ "github.com/go-sql-driver/mysql"
-    _ "github.com/mattn/go-sqlite3"
+	"fmt"
+
+	"git.watanabebashi.net/Watanabebashi/WB-Likomment/internal/config"
+	"git.watanabebashi.net/Watanabebashi/WB-Likomment/internal/model"
+	"gorm.io/driver/mysql"
+	"gorm.io/driver/sqlite"
+	"gorm.io/gorm"
 )
 
 type Database struct {
-    *sql.DB
+	*gorm.DB
 }
 
-func NewDatabase(config *Config) (*Database, error) {
-    var dsn string
-    if config.DB.Type == "mysql" {
-        dsn = fmt.Sprintf("%s:%s@tcp(%s:%d)/%s?charset=utf8mb4&parseTime=True&loc=Local",
-            config.DB.User, config.DB.Password, config.DB.Host, config.DB.Port, config.DB.Name)
-    } else if config.DB.Type == "sqlite" {
-        dsn = config.DB.Name + ".db"
-    } else {
-        return nil, fmt.Errorf("unsupported database type: %s", config.DB.Type)
-    }
+func NewDatabase(cfg *config.Config) (*Database, error) {
+	var dialector gorm.Dialector
 
-    db, err := sql.Open(config.DB.Type, dsn)
-    if err != nil {
-        return nil, err
-    }
+	if cfg.DB.Type == "mysql" {
+		dsn := fmt.Sprintf("%s:%s@tcp(%s:%d)/%s?charset=utf8mb4&parseTime=True&loc=Local",
+			cfg.DB.User, cfg.DB.Password, cfg.DB.Host, cfg.DB.Port, cfg.DB.Name)
+		dialector = mysql.Open(dsn)
+	} else if cfg.DB.Type == "sqlite" {
+		dsn := cfg.DB.Name + ".db"
+		dialector = sqlite.Open(dsn)
+	} else {
+		return nil, fmt.Errorf("unsupported database type: %s", cfg.DB.Type)
+	}
 
-    if err := db.Ping(); err != nil {
-        return nil, err
-    }
-	
-    db.SetMaxOpenConns(25)
-    db.SetMaxIdleConns(25)
+	db, err := gorm.Open(dialector, &gorm.Config{})
+	if err != nil {
+		return nil, err
+	}
 
-    return &Database{DB: db}, nil
+	// Get underlying sql.DB for connection pool settings
+	sqlDB, err := db.DB()
+	if err != nil {
+		return nil, err
+	}
+
+	sqlDB.SetMaxOpenConns(25)
+	sqlDB.SetMaxIdleConns(25)
+
+	// Auto migrate tables
+	err = db.AutoMigrate(&model.Like{}, &model.Comment{}, &model.LikeLog{})
+	if err != nil {
+		return nil, err
+	}
+
+	return &Database{DB: db}, nil
 }
 
 func (d *Database) Close() error {
-    return d.DB.Close()
+	sqlDB, err := d.DB.DB()
+	if err != nil {
+		return err
+	}
+	return sqlDB.Close()
 }