fix test db connection

.gitignore

@@ -3,22 +3,14 @@ __pycache__/
 *.py[cod]
 *$py.class
 
-# Installer logs
-pip-log.txt
-pip-delete-this-directory.txt
-
-# Database
+# Database backup
 db/
 
 # Unit test / coverage reports
-htmlcov/
 coverage/
 .coverage
 .coverage.*
-.cache
-coverage.xml
 *.cover
-*.py,cover
 .pytest_cache/
 
 # Translations
@@ -33,49 +25,20 @@ poetry.lock
 
 # Environments
 .env
-.env.production
-.env*.local
+.env.test
 .venv/
 
 # mypy
 .mypy_cache/
 .dmypy.json
 dmypy.json
 
-# dependencies
-node_modules/
-.pnp/
-.pnp.js
-.yarn/install-state.gz
-
-# next.js
-/.next/
-/out/
-
-# production
-/build
-
-# misc
-.DS_Store
-*.pem
-
-# debug
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-
-# vercel
-.vercel
-
-# typescript
-*.tsbuildinfo
-next-env.d.ts
-
 # IDE/editor settings
 .idea/
 .vscode/
 
 # Qodana
 qodana.yaml
 
-Makefile
+# Running
+Makefile

docker-compose.dev.yml

@@ -43,8 +43,8 @@ services:
     container_name: pgadmin_app
     image: dpage/pgadmin4
     environment:
-      PGADMIN_DEFAULT_EMAIL: '[email protected]'
-      PGADMIN_DEFAULT_PASSWORD: '12345678'
+      PGADMIN_DEFAULT_EMAIL: '[email protected]'
+      PGADMIN_DEFAULT_PASSWORD: 'qwerty'
     ports:
       - "5050:80"
     networks:

docker-compose.test.yml

@@ -1,16 +1,18 @@
 version: '3.8'
 
 services:
-  db:
-    container_name: db
+  db_test:
+    container_name: db_test
     image: postgres:16.2
+    env_file:
+      - .env.test
     environment:
-      - POSTGRES_DB=${DB_NAME_TEST}
-      - POSTGRES_USER=${DB_USER_TEST}
-      - POSTGRES_PASSWORD=${DB_PASS_TEST}
+      - POSTGRES_DB=${DB_NAME}
+      - POSTGRES_USER=${DB_USER}
+      - POSTGRES_PASSWORD=${DB_PASS}
     ports:
-      - ${DB_PORT_TEST}:5432
-    restart: always
+      - ${DB_PORT}:5432
+    restart: on-failure
     healthcheck:
       test: ['CMD-SHELL', 'pg_isready -U ${DB_USER}']
       interval: 10s
@@ -24,12 +26,12 @@ services:
       dockerfile: Dockerfile.test
     container_name: tests
     depends_on:
-      db:
+      db_test:
         condition: service_healthy
     ports:
       - '8000:8000'
     env_file:
-      - .env
+      - .env.test
     volumes:
       - ./:/backend/
     networks:

pyproject.toml

@@ -46,6 +46,7 @@ pytest-dependency = "^0.6.0"
 python-dateutil = "^2.9.0.post0"
 python-jose="^3.3.0"
 pytest-mock = "^3.14.0"
+pytest-dotenv = "^0.5.2"
 
 [build-system]
 requires = ["poetry-core"]
@@ -83,3 +84,4 @@ ignore_missing_imports = true
 [tool.pytest.ini_options]
 pythonpath = [ ".", "src",]
 asyncio_mode="auto"
+env_files = [".env.test"]

src/core/__init__.py

@@ -0,0 +1,10 @@
+from src.core.config import settings
+from src.core.loggers import core as logger
+
+logger.debug(f'''Database settings:
+host={settings.db_host}
+port={settings.db_port}
+name={settings.db_name}
+username={settings.db_user}
+password={settings.db_pass}
+url={settings.db_url}''')

src/core/config.py

@@ -1,12 +1,10 @@
 from pydantic import Field, EmailStr
-from pydantic_settings import BaseSettings, SettingsConfigDict
-
-from src.core.loggers import core as logger
+from pydantic_settings import BaseSettings
 
 
 class Settings(BaseSettings):
 
-    model_config = SettingsConfigDict(env_file='.env', env_file_encoding='utf-8')
+    # model_config = SettingsConfigDict(env_file_encoding='utf-8')
 
     root_url: str = Field(default='http://localhost:8000', alias='ROOT_URL')
 
@@ -25,20 +23,10 @@ class Settings(BaseSettings):
     db_user: str = Field(default='postgres', alias='DB_USER')
     db_pass: str = Field(default='postgres', alias='DB_PASS')
 
-    db_host_test: str = Field(default='localhost', alias='DB_HOST_TEST')
-    db_port_test: int = Field(default=6000, alias='DB_PORT_TEST')
-    db_name_test: str = Field(default='postgres', alias='DB_NAME_TEST')
-    db_user_test: str = Field(default='postgres', alias='DB_USER_TEST')
-    db_pass_test: str = Field(default='postgres', alias='DB_PASS_TEST')
-
     redis_host: str = Field(default='localhost', alias='REDIS_HOST')
     redis_port: int = Field(default=6379, alias='REDIS_PORT')
     redis_pass: str = Field(default='qwerty', alias='REDIS_PASS')
 
-    redis_host_test: str = Field(default='localhost', alias='REDIS_HOST_TEST')
-    redis_port_test: int = Field(default=6379, alias='REDIS_PORT_TEST')
-    redis_pass_test: str = Field(default='qwerty', alias='REDIS_PASS_TEST')
-
     echo: bool = True
 
     jwt_secret_key: str = Field(default='', alias='JWT_SECRET_KEY')
@@ -55,17 +43,5 @@ class Settings(BaseSettings):
     def db_url(self) -> str:
         return f"postgresql+asyncpg://{self.db_user}:{self.db_pass}@{self.db_host}:{self.db_port}/{self.db_name}"
 
-    @property
-    def db_url_test(self) -> str:
-        return f'postgresql+asyncpg://{self.db_user_test}:{self.db_pass_test}@{self.db_host_test}:{self.db_port_test}/{self.db_name_test}'
-
 
 settings = Settings()
-
-logger.debug(f'''Database settings:
-host={settings.db_host}
-port={settings.db_port}
-name={settings.db_name}
-username={settings.db_user}
-password={settings.db_pass}
-url={settings.db_url}''')

tests/conftest.py

@@ -1,20 +1,16 @@
 import pytest
 from fastapi.testclient import TestClient
-from sqlalchemy.ext.asyncio import create_async_engine, async_sessionmaker
 
 from src.api.app import app
 from src.core.config import settings
 from src.repositories.database.base import SQLAlchemyRepository  # noqa: F401
 
-engine_test = create_async_engine(settings.db_url_test, echo=True)
-sessionmaker_test = async_sessionmaker(engine_test)
-
 
 @pytest.fixture(scope='function')
 def client() -> TestClient:
     return TestClient(app=app)
 
 
 @pytest.fixture(scope='session')
-def replace_sessionmaker(mocker):  # type: ignore[no-untyped-def]
-    mocker.patch('SQLAlchemyRepository.sessionmaker', new=sessionmaker_test)
+def replace_db_url(mocker):  # type: ignore[no-untyped-def]
+    mocker.patch('settings.db_url', new=settings.db_url_test)