Fix database

backend/app/core/config.py

@@ -1,36 +1,32 @@
-"""Application configuration"""
+"""Configuration module"""
 import os
-from typing import Any
 from pydantic_settings import BaseSettings
-from functools import lru_cache
 
 class Settings(BaseSettings):
     """Application settings"""
-    # База данных
+    PROJECT_NAME: str = "Employee Request System"
-    POSTGRES_USER: str = "postgres"
+    API_V1_STR: str = "/api"
-    POSTGRES_PASSWORD: str = "postgres"
+    
-    POSTGRES_HOST: str = os.getenv("POSTGRES_HOST", "postgres")
+    # Database
-    POSTGRES_PORT: str = "5432"
+    POSTGRES_USER: str = os.getenv("POSTGRES_USER", "postgres")
-    POSTGRES_DB: str = "app"
+    POSTGRES_PASSWORD: str = os.getenv("POSTGRES_PASSWORD", "postgres")
-    POSTGRES_TEST_DB: str = "test_app"
+    POSTGRES_HOST: str = os.getenv("POSTGRES_HOST", "localhost")
+    POSTGRES_PORT: str = os.getenv("POSTGRES_PORT", "5432")
+    POSTGRES_DB: str = os.getenv("POSTGRES_DB", "app")
     
     # JWT
-    SECRET_KEY: str = "your-secret-key"
+    SECRET_KEY: str = os.getenv("SECRET_KEY", "your-secret-key-super-secret")
     ALGORITHM: str = "HS256"
     ACCESS_TOKEN_EXPIRE_MINUTES: int = 30
     
-    # Режим тестирования
-    TESTING: bool = bool(os.getenv("TESTING", ""))
-
     # Redis
-    REDIS_HOST: str = "redis"
+    REDIS_HOST: str = os.getenv("REDIS_HOST", "localhost")
-    REDIS_PORT: int = 6379
+    REDIS_PORT: int = int(os.getenv("REDIS_PORT", "6379"))
-    REDIS_DB: int = 0
+    REDIS_DB: int = int(os.getenv("REDIS_DB", "0"))
-    REDIS_TEST_DB: int = 1
     
     # Telegram
-    TELEGRAM_BOT_TOKEN: str = ""
+    TELEGRAM_BOT_TOKEN: str = os.getenv("TELEGRAM_BOT_TOKEN", "")
-    TELEGRAM_CHAT_ID: str = ""
+    TELEGRAM_CHAT_ID: str = os.getenv("TELEGRAM_CHAT_ID", "")
     
     model_config = {
         "case_sensitive": True,
@@ -40,29 +36,9 @@ class Settings(BaseSettings):
 
     def get_database_url(self) -> str:
         """Get database URL"""
-        # Получаем URL из переменной окружения, если она есть
+        return os.getenv(
-        if os.getenv("DATABASE_URL"):
+            "DATABASE_URL",
-            return os.getenv("DATABASE_URL")
+            f"postgresql://{self.POSTGRES_USER}:{self.POSTGRES_PASSWORD}@{self.POSTGRES_HOST}:{self.POSTGRES_PORT}/{self.POSTGRES_DB}"
+        )
 
-        # Иначе формируем URL на основе настроек
+settings = Settings() 
-        if self.TESTING:
-            host = os.getenv("POSTGRES_HOST", "postgres")
-            db = self.POSTGRES_TEST_DB
-        else:
-            host = self.POSTGRES_HOST
-            db = self.POSTGRES_DB
-            
-        return f"postgresql://{self.POSTGRES_USER}:{self.POSTGRES_PASSWORD}@{host}:{self.POSTGRES_PORT}/{db}"
-
-    def get_redis_url(self) -> str:
-        """Get Redis URL"""
-        db = self.REDIS_TEST_DB if self.TESTING else self.REDIS_DB
-        host = "localhost" if self.TESTING else self.REDIS_HOST
-        return f"redis://{host}:{self.REDIS_PORT}/{db}"
-
-@lru_cache()
-def get_settings() -> Settings:
-    """Get cached settings"""
-    return Settings()
-
-settings = get_settings() 

backend/app/core/test_config.py

@@ -5,6 +5,7 @@ from pydantic_settings import BaseSettings
 class TestSettings(BaseSettings):
     """Test settings"""
     PROJECT_NAME: str = "Employee Request System Test"
+    API_V1_STR: str = "/api"
     
     # Database
     POSTGRES_USER: str = "postgres"