From 7bf67372e9a1715b827515d2764144e28561ee2e Mon Sep 17 00:00:00 2001
From: David Janowski <david.janowski@nea-x.net>
Date: Mon, 22 May 2023 14:26:10 +0200
Subject: [PATCH] fix: used required field for verification

---
 utils/config.go | 34 +++++-----------------------------
 1 file changed, 5 insertions(+), 29 deletions(-)

diff --git a/utils/config.go b/utils/config.go
index e83cecf..7f78f7d 100644
--- a/utils/config.go
+++ b/utils/config.go
@@ -6,11 +6,11 @@ import (
 )
 
 type Config struct {
-	E621APIKey    string `env:"e621_API_KEY"`
-	E621Username  string `env:"e621_USERNAME"`
-	Neo4jURL      string `env:"NEO4J_URL"`
-	Neo4jUsername string `env:"NEO4J_USERNAME"`
-	Neo4jPassword string `env:"NEO4J_PASSWORD"`
+	E621APIKey    string `env:"E621_API_KEY,required"`
+	E621Username  string `env:"E621_USERNAME,required"`
+	Neo4jURL      string `env:"NEO4J_URL,required"`
+	Neo4jUsername string `env:"NEO4J_USERNAME,required"`
+	Neo4jPassword string `env:"NEO4J_PASSWORD,required"`
 }
 
 // LoadConfig loads the configuration from environment variables
@@ -20,29 +20,5 @@ func LoadConfig() (*Config, error) {
 		return nil, fmt.Errorf("error parsing configuration: %w", err)
 	}
 
-	if err := ValidateConfig(config); err != nil {
-		return nil, fmt.Errorf("configuration validation failed: %w", err)
-	}
-
 	return config, nil
 }
-
-// ValidateConfig checks if all required fields in the configuration are set
-func ValidateConfig(config *Config) error {
-	if config.E621APIKey == "" {
-		return fmt.Errorf("e621_API_KEY is not set")
-	}
-	if config.E621Username == "" {
-		return fmt.Errorf("e621_USERNAME is not set")
-	}
-	if config.Neo4jURL == "" {
-		return fmt.Errorf("NEO4J_URL is not set")
-	}
-	if config.Neo4jUsername == "" {
-		return fmt.Errorf("NEO4J_USERNAME is not set")
-	}
-	if config.Neo4jPassword == "" {
-		return fmt.Errorf("NEO4J_PASSWORD is not set")
-	}
-	return nil
-}