From 7e527715d1b5842731670ad6e77a4023bb336980 Mon Sep 17 00:00:00 2001 From: Adam French Date: Sun, 23 Nov 2025 20:40:21 +0000 Subject: [PATCH] separating logic for config --- backend/services/database.go | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/backend/services/database.go b/backend/services/database.go index ff55354..0badf9d 100644 --- a/backend/services/database.go +++ b/backend/services/database.go @@ -2,23 +2,24 @@ package services import ( "fmt" - "os" "adam-french.co.uk/backend/models" "gorm.io/driver/postgres" "gorm.io/gorm" ) -func connectToPostgreSQL() (*gorm.DB, error) { - user := os.Getenv("POSTGRES_USER") - password := os.Getenv("POSTGRES_PASSWORD") - dbname := os.Getenv("POSTGRES_DB") - host := os.Getenv("POSTGRES_HOST") - port := os.Getenv("POSTGRES_PORT") +type SQLConfig struct { + User string + Password string + DBName string + Host string + Port string +} +func connectToPostgreSQL(config SQLConfig) (*gorm.DB, error) { dsn := fmt.Sprintf( "user=%s password=%s dbname=%s host=%s port=%s sslmode=disable", - user, password, dbname, host, port, + config.User, config.Password, config.DBName, config.Host, config.Port, ) db, err := gorm.Open(postgres.Open(dsn), &gorm.Config{}) @@ -42,8 +43,8 @@ func migrateDatabase(db *gorm.DB) error { return nil } -func InitDatabase() (*gorm.DB, error) { - db, err := connectToPostgreSQL() +func InitDatabase(config SQLConfig) (*gorm.DB, error) { + db, err := connectToPostgreSQL(config) if err != nil { return nil, err }