Merge pull request #3 from cuappdev/deployment-fix

Fixed logging and load env

Author: JoshD94

go.mod

@@ -25,6 +25,7 @@ require (
 	github.com/jackc/puddle/v2 v2.2.2 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/jinzhu/now v1.1.5 // indirect
+	github.com/joho/godotenv v1.5.1 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/klauspost/cpuid/v2 v2.2.7 // indirect
 	github.com/kr/text v0.2.0 // indirect

go.sum

@@ -41,6 +41,8 @@ github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD
 github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
 github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ=
 github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
+github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
+github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
 github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=

main.go

@@ -3,12 +3,17 @@ package main
 import (
 	"log"
 	"github.com/gin-gonic/gin"
-
+	"github.com/joho/godotenv"
   	"github.com/cuappdev/hustle-backend/models"
   	"github.com/cuappdev/hustle-backend/controllers"
 )
 
 func main() {
+	err := godotenv.Load()
+	if err != nil {
+		log.Println("Error loading .env file.")
+	}
+
 	log.Println("Starting hustle-backend...")
   	r := gin.Default()
 	log.Println("Connecting to database...")

models/setup.go

@@ -1,6 +1,7 @@
 package models
 
 import (
+    "fmt"
     "log"
     "os"
     "time"
@@ -10,7 +11,7 @@ import (
 
 var DB *gorm.DB
 
-func ConnectDatabase() {
+func ConnectDatabase() error {
     // Build connection string from env variables
     host := getEnv("DB_HOST", "localhost")
     user := getEnv("DB_USER", "postgres")
@@ -19,31 +20,31 @@ func ConnectDatabase() {
     password := getEnv("DB_PASSWORD", "")
     sslmode := getEnv("DB_SSLMODE", "require")
 
-    dsn := "host=" + host + " user=" + user + " password=" + password + " dbname=" + dbname + " port=" + port + " sslmode=" + sslmode + " TimeZone=UTC"
-    
+    log.Println("Connecting to database with DSN:", dsn)
+
     database, err := gorm.Open(postgres.Open(dsn), &gorm.Config{})
     if err != nil {
-        return err
+        return fmt.Errorf("failed to connect to database: %w", err)
     }
 
     sqlDB, err := database.DB()
     if err != nil {
-        return err
+        return fmt.Errorf("failed to get database instance: %w", err)
     }
 
     sqlDB.SetMaxIdleConns(10)
     sqlDB.SetMaxOpenConns(100)
     sqlDB.SetConnMaxLifetime(time.Hour)
 
-	// Make sure to include all models to migrate here
+    // Make sure to include all models to migrate here
     err = database.AutoMigrate(&User{})
     if err != nil {
-        log.Printf("Failed to migrate database: %v", err)
-        return err
+        return fmt.Errorf("failed to migrate database: %w", err)
     }
 
     DB = database
     log.Println("Database connected successfully")
+    return nil
 }
 
 func getEnv(key, defaultValue string) string {