fix: refactor layout init

database/new_db.go

@@ -2,11 +2,8 @@ package database
 
 import (
 	"fmt"
-	"os"
 
-	staffmodel "github.com/ardeman/project-legalgo-go/database/staff"
-	subsmodel "github.com/ardeman/project-legalgo-go/database/subscribe"
-	usermodel "github.com/ardeman/project-legalgo-go/database/user"
+	"github.com/ardeman/project-legalgo-go/config"
 	"gorm.io/driver/postgres"
 	"gorm.io/gorm"
 )
@@ -16,16 +13,15 @@ type DB struct {
 }
 
 func NewDB() (*DB, error) {
-	var (
-		host     = os.Getenv("DB_HOST")
-		user     = os.Getenv("DB_USER")
-		password = os.Getenv("DB_PASSWORD")
-		dbName   = os.Getenv("DB_NAME")
-		dbPort   = os.Getenv("DB_PORT")
+	dsn := fmt.Sprintf(
+		"host=%s user=%s password=%s dbname=%s port=%v sslmode=disable",
+		config.DB_HOST,
+		config.DB_USER,
+		config.DB_PASSWORD,
+		config.DB_NAME,
+		config.DB_PORT,
 	)
 
-	dsn := fmt.Sprintf("host=%s user=%s password=%s dbname=%s port=%v sslmode=disable", host, user, password, dbName, dbPort)
-
 	if dsn == "" {
 		return nil, fmt.Errorf("DATABASE_URL environment is not set")
 	}
@@ -42,9 +38,9 @@ func NewDB() (*DB, error) {
 func (db *DB) Migrate() error {
 	// Auto Migrate the User model
 	return db.AutoMigrate(
-		&staffmodel.Staff{},
-		&subsmodel.SubscribePlan{},
-		&subsmodel.Subscribe{},
-		&usermodel.User{},
+		&Staff{},
+		&SubscribePlan{},
+		&Subscribe{},
+		&User{},
 	)
 }