From 7a79028aa76c4a0c2b4579fdb2857459b86f8e6d Mon Sep 17 00:00:00 2001
From: Nikolai Papin <nikolai@weirdcat.ru>
Date: Wed, 18 Jun 2025 20:17:04 +0300
Subject: [PATCH] refactor: config

---
 backend/config/config.go | 46 +++++++++++++++++-----------------------
 1 file changed, 20 insertions(+), 26 deletions(-)

diff --git a/backend/config/config.go b/backend/config/config.go
index 2b0ff8e..7e7a525 100644
--- a/backend/config/config.go
+++ b/backend/config/config.go
@@ -1,46 +1,49 @@
 package config
 
 import (
+	"fmt"
 	"log"
 	"reflect"
-	"fmt"
 
 	"github.com/spf13/viper"
 )
 
 type Config struct {
-	Hostname 		string `mapstructure:"HOSTNAME"`
-	Port     		string `mapstructure:"PORT"`
+	Hostname 				string `mapstructure:"HOSTNAME"`
+	Port     				string `mapstructure:"PORT"`
 
-	DatabaseUrl 	string `mapstructure:"DATABASE_URL"`
-	RedisUrl 		string `mapstructure:"REDIS_URL"`
-	MinioUrl 		string `mapstructure:"MINIO_URL"`
+	DatabaseUrl 		string `mapstructure:"POSTGRES_URL"`
+	RedisUrl 				string `mapstructure:"REDIS_URL"`
+	MinioUrl 				string `mapstructure:"MINIO_URL"`
 
-	JwtAlgorithm 	string `mapstructure:"JWT_ALGORITHM"`
-	JwtSecret 		string `mapstructure:"JWT_SECRET"`
-	JwtIssuer 		string `mapstructure:"JWT_ISSUER"`
-	JwtAudience 	string `mapstructure:"JWT_AUDIENCE"`
-	JwtExpAccess 	string `mapstructure:"JWT_EXP_ACCESS"`
+	JwtAlgorithm 		string `mapstructure:"JWT_ALGORITHM"`
+	JwtSecret 			string `mapstructure:"JWT_SECRET"`
+	JwtIssuer 			string `mapstructure:"JWT_ISSUER"`
+	JwtAudience 		string `mapstructure:"JWT_AUDIENCE"`
+	JwtExpAccess 		string `mapstructure:"JWT_EXP_ACCESS"`
 	JwtExpRefresh 	string `mapstructure:"JWT_EXP_REFRESH"`
 
-	Environment 	string `mapstructure:"ENVIRONMENT"`
+	Environment 		string `mapstructure:"ENVIRONMENT"`
 }
 
 var config *Config
 
 func LoadConfig() error {
 
+	viper.AutomaticEnv()
+
+	viper.SetConfigName(".env")
+	viper.SetConfigType("env")
+	viper.AddConfigPath(".")
+
 	// Load .env file
 	if err := viper.ReadInConfig(); err != nil {
-		log.Printf("Error reading config file, proceeding with environment variables. %s", err)
+		log.Printf("Error reading .env file, proceeding with environment variables. %s", err)
 	}
 
-	// Set default parameters
 	viper.SetDefault("HOSTNAME", "localhost")
 	viper.SetDefault("PORT", "8080")
-	viper.SetDefault("DATABASE_URL", "mydb")
-	viper.SetDefault("REDIS_URL", "myredis")
-	viper.SetDefault("MINIO_URL", "myminio")
+
 	viper.SetDefault("JWT_ALGORITHM", "HS256")
 	viper.SetDefault("JWT_SECRET", "default_jwt_secret_please_change") // TODO: remove and randomly generate
 	viper.SetDefault("JWT_EXP_ACCESS", "5m")
@@ -50,17 +53,10 @@ func LoadConfig() error {
 	
 	viper.SetDefault("ENVIRONMENT", "production")
 
-	// Set the file name and type for Viper
-	viper.SetConfigName(".env") // name of config file (without extension)
-	viper.SetConfigType("env")   // REQUIRED if the config file does not have the extension
-	viper.AddConfigPath(".")     // optionally look for config in the working directory
-
-	// Unmarshal the configuration into the Config struct
 	if err := viper.Unmarshal(&config); err != nil {
 		log.Fatalf("Unable to decode into struct, %v", err)
 	}
 
-	// Perform validation
 	if err := validateConfig(); err != nil {
 		return err
 	}
@@ -76,7 +72,6 @@ func validateConfig() error {
 		field := v.Field(i)
 		fieldType := t.Field(i)
 
-		// Check if the field is a string and is empty
 		if field.Kind() == reflect.String && field.String() == "" {
 			return fmt.Errorf("Missing required configuration: %s", fieldType.Name)
 		}
@@ -88,4 +83,3 @@ func validateConfig() error {
 func GetConfig() *Config {
 	return config
 }
-