Merge pull request #44 from seamusic-official/rm/extra_fields

fix makefile + configs

Makefile

@@ -6,13 +6,13 @@ run-local:
 	poetry run uvicorn src.api.app:app --host 0.0.0.0 --port 8000 --reload --reload-dir . --log-config=log_config.ini --log-level=debug
 
 build:
-	poetry run sudo docker compose -f docker-compose.$(for).yml build
+	poetry run docker-compose -f docker-compose.$(for).yml build
 
 start:
-	poetry run sudo docker compose -f docker-compose.$(for).yml up --force-recreate --remove-orphans
+	poetry run docker-compose -f docker-compose.$(for).yml up --force-recreate --remove-orphans
 
 up:
-	poetry run sudo docker compose -f docker-compose.$(for).yml up --force-recreate --remove-orphans -d
+	poetry run docker-compose -f docker-compose.$(for).yml up --force-recreate --remove-orphans -d
 
 stop:
 	poetry run docker-compose -f docker-compose.$(for).yml stop

pyproject.toml

@@ -82,6 +82,4 @@ strict_optional = true
 ignore_missing_imports = true
 
 [tool.pytest.ini_options]
-pythonpath = [ ".", "src",]
-asyncio_mode="auto"
-env_files = [".env.test"]
+asyncio_mode = "auto"

src/repositories/database/base.py

@@ -8,6 +8,15 @@
 from src.core.config import settings
 from src.models.base import Base
 
+engine = create_async_engine(
+    url=settings.db_url,
+    echo=settings.echo,
+)
+sessionmaker = async_sessionmaker(
+    bind=engine,
+    expire_on_commit=False,
+)
+
 
 @dataclass
 class BaseDatabaseRepository(ABC):
@@ -22,34 +31,30 @@ class DatabaseRepositories(ABC):
 @dataclass
 class SQLAlchemyRepository(BaseDatabaseRepository):
 
-    engine = create_async_engine(url=settings.db_url, echo=settings.echo, pool_pre_ping=True)
-    sessionmaker = async_sessionmaker(engine, expire_on_commit=False)
-
     async def add(self, obj: Base) -> None:
-        async with self.sessionmaker() as session:
+        async with sessionmaker() as session:
             session.add(obj)
             await session.commit()
-            await self.engine.dispose()
 
     async def merge(self, obj: Base) -> None:
-        async with self.sessionmaker() as session:
+        async with sessionmaker() as session:
             await session.merge(obj)
 
     async def execute(self, statement: Executable) -> None:
-        async with self.sessionmaker() as session:
+        async with sessionmaker() as session:
             await session.execute(statement)
 
     async def get(self, table: type[Base], primary_key: Any):  # type: ignore[no-untyped-def]
-        async with self.sessionmaker() as session:
+        async with sessionmaker() as session:
             model = await session.get(table, primary_key)
         return model
 
     async def scalar(self, statement: Executable) -> Any:
-        async with self.sessionmaker() as session:
+        async with sessionmaker() as session:
             item = await session.scalar(statement)
         return item
 
     async def scalars(self, statement: Executable) -> Iterable:
-        async with self.sessionmaker() as session:
+        async with sessionmaker() as session:
             items = await session.scalars(statement)
         return items

tests/conftest.py

@@ -1,5 +1,6 @@
 import pytest
 from fastapi.testclient import TestClient
+
 from src.api.app import app
 
 

tests/connections/database/test_postgres.py

@@ -1,7 +1,8 @@
-from src.core.config import settings
 from sqlalchemy import text
 from sqlalchemy.ext.asyncio import create_async_engine, async_sessionmaker
 
+from src.core.config import settings
+
 test_engine = create_async_engine(settings.db_url, echo=True)
 
 sessionmaker_test = async_sessionmaker(test_engine)