refactor: update database session management in authentication and router setup

Author: IkeSalmonson

app/main.py

@@ -13,7 +13,7 @@
 async def lifespan(app: FastAPI):
     # add check db file and create if not found
     await init_db()
-    app.db_session_factory = AsyncSessionLocal
+    app.db_session_factory = AsyncSessionLocal()
     try:
         yield
     finally:
@@ -27,11 +27,6 @@ async def lifespan(app: FastAPI):
 )
 
 
-async def get_db_session():
-    # Usa app.attr para acessar a fábrica de sessões que foi injetada
-    async with app.db_session_factory() as session:
-        yield session
-
-app.include_router(setup_router_v2(get_db_session), prefix="/api") 
+app.include_router(setup_router_v2(), prefix="/api") 
 
 logger.info("PyNews Server Starter")

app/routers/authentication.py

@@ -1,4 +1,4 @@
-from fastapi import APIRouter, Depends, HTTPException, status
+from fastapi import APIRouter, Depends, HTTPException, status, Request
 from fastapi.security import OAuth2PasswordBearer, OAuth2PasswordRequestForm
 from sqlmodel.ext.asyncio.session import AsyncSession
 import jwt
@@ -11,13 +11,13 @@
 
 oauth2_scheme = OAuth2PasswordBearer(tokenUrl="/authentication/token")
 
-def setup(get_db_session_dep):
+def setup():
     router = APIRouter(prefix='/authentication', tags=['authentication'])
-    async def authenticate_community(username: str, password: str, session: AsyncSession = Depends(get_db_session_dep)):
+    async def authenticate_community(request: Request , username: str, password: str):
         # Valida se o usuário existe e se a senha está correta
         found_community = await get_community_by_username(
         username=username,
-        session=session
+        session=request.app.db_session_factory
     )
         if not found_community or not auth.verify_password(password, found_community.password):
             return None
@@ -27,20 +27,21 @@ async def authenticate_community(username: str, password: str, session: AsyncSes
     #### Teste 
 
     @router.post("/create_commumity")
-    async def create_community( session: AsyncSession = Depends(get_db_session_dep)):
+    async def create_community(request: Request ):
         password = "123Asd!@#"
         hashed_password=auth.hash_password(password)
         community = DBCommunity(username="username", email="username@test.com", password=hashed_password)
+        session = request.app.db_session_factory
         session.add(community)
         await session.commit()
         await session.refresh(community)
         return {'msg':'succes? '}
     #### Teste 
 
     @router.post("/token", response_model=Token)
-    async def login_for_access_token(form_data: OAuth2PasswordRequestForm = Depends(), session: AsyncSession = Depends(get_db_session_dep)) :
+    async def login_for_access_token(request: Request , form_data: OAuth2PasswordRequestForm = Depends() ) :
         # Rota de login: valida credenciais e retorna token JWT
-        community = await authenticate_community(form_data.username, form_data.password, session)
+        community = await authenticate_community(form_data.username, form_data.password, request.app.db_session_factory)
         if not community:
             raise HTTPException(
                 status_code=status.HTTP_401_UNAUTHORIZED,

app/routers/router.py

@@ -4,9 +4,9 @@
 from app.routers.news.routes import setup as news_router_setup
 from app.routers.authentication import setup as authentication_router_setup
 
-def setup_router(get_db_session_dep) -> APIRouter:
+def setup_router() -> APIRouter:
     router = APIRouter()
     router.include_router(healthcheck_router_setup(), prefix="")
     router.include_router(news_router_setup(), prefix="")
-    router.include_router(authentication_router_setup(get_db_session_dep), prefix='')
+    router.include_router(authentication_router_setup(), prefix='')
     return router

tests/conftest.py

@@ -9,8 +9,8 @@
 from sqlmodel import SQLModel
 from sqlmodel.ext.asyncio.session import AsyncSession
 
-from app.main import app as fastapi_app
-from app.main import get_db_session
+from app.main import app
+#from app.main import get_db_session
 
 # Importar todos os modelos SQLModel a serem usados
 # (necessários para as validações de modelo)
@@ -50,19 +50,11 @@ async def session() -> AsyncGenerator[AsyncSession, None]:
     yield session
     await session.close()
 
-
-@pytest.fixture
-def test_app() -> Generator[FastAPI]:
-    # Create a mock schema checker
-    mock_schema_checker = AsyncMock()
-    mock_schema_checker.validate = AsyncMock(return_value=None)
-    mock_schema_checker.start = AsyncMock(return_value=None)
-
-    # Add the mock to the app
-    fastapi_app.schema_checker = mock_schema_checker
-    fastapi_app.dependency_overrides[get_db_session] = get_db_session_test
-    yield fastapi_app
-    fastapi_app.dependency_overrides.clear()
+@pytest_asyncio.fixture
+async def test_app(session) -> FastAPI:
+    mock_db_connection = session
+    setattr(app, 'db_session_factory', mock_db_connection)
+    return app
 
 
 @pytest_asyncio.fixture(scope="function")