Merge pull request #4 from sumaro2101/develop

Tests

Author: sumaro2101

.env.sample

@@ -22,4 +22,14 @@ GF_SECURITY_ADMIN_USER=admin
 GF_SECURITY_ADMIN_PASSWORD=admin
 # ==================CADDY==================
 ADMIN_USER=admin
-ADMIN_PASSWORD=admin
+ADMIN_PASSWORD=admin
+# ==================TESTS==================
+TEST_POSTGRES_DB=test_analizer
+TEST_POSTGRES_PASSWORD=
+
+TEST_DB_ENGINE=postgresql+asyncpg
+TEST_DB_NAME=test_analizer
+TEST_DB_USER=postgres
+TEST_DB_PASSWORD=
+TEST_DB_HOST=test_db
+TEST_DB_PORT=5431

api_v1/tests/__init__.py

@@ -0,0 +1,62 @@
+import sys
+import asyncio
+import httpx
+import pytest_asyncio
+import pytest
+
+from typing import Any, AsyncGenerator
+from contextlib import asynccontextmanager
+from asgi_lifespan import LifespanManager
+from fastapi import FastAPI
+from sqlalchemy.pool import NullPool
+
+from config import test_connection, settings, BaseModel
+from config import db_connection
+from api_v1.routers import register_routers
+
+
+db_setup = test_connection(
+    settings.test_db.url,
+    poolclass=NullPool,
+)
+
+
+@pytest.fixture(scope='session', autouse=True)
+def event_loop(request):
+    loop = asyncio.get_event_loop_policy().new_event_loop()
+    yield loop
+    loop.close()
+
+
+async def override_get_async_session():
+    async with db_setup.session() as session:
+        yield session
+
+
+@pytest_asyncio.fixture(scope='session', autouse=True)
+async def app():
+    @asynccontextmanager
+    async def lifespan(app: FastAPI):
+        async with db_setup.engine.begin() as conn:
+            await conn.run_sync(BaseModel.metadata.create_all)
+            sys.stdout.write('alembic upgrade head')
+            yield
+            await conn.run_sync(BaseModel.metadata.drop_all)
+
+    app = FastAPI(docs_url=None, redoc_url=None)
+    register_routers(app=app)
+    app.dependency_overrides[db_connection.session_geter] = override_get_async_session
+
+    async with LifespanManager(app) as manager:
+        yield manager.app
+
+
+@pytest_asyncio.fixture(scope='session')
+async def client(app: FastAPI) -> AsyncGenerator[httpx.AsyncClient, Any]:
+    current_home = settings.CURRENT_ORIGIN
+    current_api = settings.API_PREFIX
+    async with httpx.AsyncClient(
+        app=app,
+        base_url=current_home + current_api,
+    ) as client:
+        yield client

api_v1/tests/conftest.py

@@ -0,0 +1,11 @@
+import pytest
+
+from httpx import AsyncClient
+
+
+@pytest.mark.asyncio
+async def test_get_user_error(client: AsyncClient):
+    response = await client.get(
+        '/users/get',
+    )
+    assert response.status_code == 400

api_v1/tests/test_users.py

@@ -1,11 +1,13 @@
 from .config import settings
 from .celery.connection import app as celery_app
 from .database.db_helper import db_helper as db_connection
+from .database.db_helper import db_test as test_connection
 from .models.base import Base as BaseModel
 
 
 __all__ = ('settings',
            'celery_app',
            'db_connection',
+           'test_connection',
            'BaseModel',
            )

config/__init__.py

@@ -11,6 +11,18 @@
 config = Config('.env')
 
 
+class TestDBSettings(BaseModel):
+    """
+    Настройки тестовой базы данных
+    """
+    _engine: str = config('TEST_DB_ENGINE')
+    _owner: str = config('TEST_DB_USER')
+    _password: str = config('TEST_DB_PASSWORD')
+    _name: str = config('TEST_DB_HOST')
+    _db_name: str = config('TEST_DB_NAME')
+    url: str = f'{_engine}://{_owner}:{_password}@{_name}/{_db_name}'
+
+
 class DBSettings(BaseModel):
     """
     Настройки DataBase
@@ -49,6 +61,7 @@ class Settings(BaseSettings):
         extra='ignore',
     )
     db: DBSettings = DBSettings()
+    test_db: TestDBSettings = TestDBSettings()
     rabbit: RabbitSettings = RabbitSettings()
     debug: bool = bool(int(config('DEBUG')))
     API_PREFIX: str = '/api/v1'

config/config.py

@@ -3,22 +3,37 @@
                                     async_scoped_session,
                                     AsyncSession,
                                     )
+from sqlalchemy.pool import Pool
 from asyncio import current_task
 
 from typing import AsyncGenerator, Any
 
 from config import settings
 
 
+DATA_BASE_URL = settings.db.url
+
+
 class DataBaseHelper:
     """
     Вспомогательный класс для работы с Базой Данных
     """
-    def __init__(self) -> None:
-        self.engine = create_async_engine(
-            url=settings.db.url,
+    def __init__(self,
+                 db_url: str = DATA_BASE_URL,
+                 poolclass: Pool | None = None,
+                 ) -> None:
+        self._db_url = db_url
+        setup = dict(
+            url=self._db_url,
             echo=settings.debug,
         )
+        if poolclass:
+            setup.update(
+                poolclass=poolclass,
+            )
+        self.engine = create_async_engine(
+            **setup
+        )
         self.session = async_sessionmaker(
             bind=self.engine,
             autoflush=False,
@@ -43,3 +58,4 @@ async def session_geter(self) -> AsyncGenerator[AsyncSession, Any]:
 
 
 db_helper = DataBaseHelper()
+db_test = DataBaseHelper

config/database/db_helper.py

@@ -49,8 +49,8 @@ services:
     command: /start-flower
     volumes:
       - .:/app
-    ports:
-      - 5555:5555
+    expose:
+      - 5555
     env_file:
       - .env
     depends_on:
@@ -68,6 +68,18 @@ services:
     env_file:
       - .env
 
+  test_db:
+    restart: always
+    image: postgres:16.3-alpine
+    volumes:
+      - test_postgres_data:/var/lib/postgresql/data/
+    hostname: test_db
+    expose:
+      - 5431
+    environment:
+      - POSTGRES_DB=${TEST_POSTGRES_DB}
+      - POSTGRES_PASSWORD=${TEST_POSTGRES_PASSWORD}
+
   prometheus:
     image: prom/prometheus
     container_name: prometheus
@@ -112,9 +124,14 @@ services:
       - grafana-data:/var/lib/grafana
       - ./grafana/provisioning:/etc/grafana/provisioning
     environment:
+      - DATABASE_USER=${DB_USER}
+      - DATABASE_PASS=${DB_PASSWORD}
+      - DATABASE_NAME=${DB_NAME}
+      - DATABASE_HOST=${DB_HOST}
+      - DATABASE_SSL_MODE=disable
       - GF_USERS_ALLOW_SIGN_UP=false
-    env_file:
-      - .env
+      - GF_SECURITY_ADMIN_USER=${GF_SECURITY_ADMIN_USER}
+      - GF_SECURITY_ADMIN_PASSWORD=${GF_SECURITY_ADMIN_PASSWORD}
     restart: unless-stopped
     expose:
       - 3000
@@ -130,6 +147,7 @@ services:
       - "3000:3000"
       - "9090:9090"
       - "9093:9093"
+      - "5555:5555"
     volumes:
       - ./caddy:/etc/caddy
     environment:
@@ -143,6 +161,7 @@ services:
 
 volumes:
   postgres_data:
+  test_postgres_data:
   rabbitmq-data:
   prometheus-data: {}
   grafana-data: {}

docker-compose.yml

@@ -7,4 +7,5 @@ receivers:
           - send_resolved: true
             text: "{{ .CommonAnnotations.description }}"
             username: 'Prometheus'
-            channel: '#prometheus'
+            channel: '#prometheus'
+            api_url: https://hooks.slack.com/services/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

docker/alertmanager/config.yml

@@ -23,6 +23,9 @@ prometheus-fastapi-instrumentator = "^7.0.0"
 
 [tool.poetry.group.dev.dependencies]
 black = "^24.10.0"
+pytest-asyncio = "^0.24.0"
+asgi-lifespan = "^2.1.0"
+flake8 = "^7.1.1"
 
 [build-system]
 requires = ["poetry-core"]