Refactor tests

Author: Pau Tena

backend/app/auth/repository.py

@@ -0,0 +1,14 @@
+from sqlmodel import Session
+
+from app.core.security import verify_password
+from app.users.models import User
+from app.users.repository import get_user_by_email
+
+
+def authenticate(*, session: Session, email: str, password: str) -> User | None:
+    db_user = get_user_by_email(session=session, email=email)
+    if not db_user:
+        return None
+    if not verify_password(password, db_user.hashed_password):
+        return None
+    return db_user

backend/app/auth/routes.py

@@ -5,12 +5,13 @@
 from fastapi.responses import HTMLResponse
 from fastapi.security import OAuth2PasswordRequestForm
 
-from app import crud
+from app.auth import repository as auth_repository
 from app.auth.models import NewPassword, Token
 from app.core import security
 from app.core.config import settings
 from app.core.security import get_password_hash
 from app.models import Message
+from app.users import repository as users_repository
 from app.users.dependencies import CurrentUser, SessionDep, get_current_active_superuser
 from app.users.models import UserPublic
 from app.utils.utils import (
@@ -30,7 +31,7 @@ def login_access_token(
     """
     OAuth2 compatible token login, get an access token for future requests
     """
-    user = crud.authenticate(
+    user = auth_repository.authenticate(
         session=session, email=form_data.username, password=form_data.password
     )
     if not user:
@@ -58,7 +59,7 @@ def recover_password(email: str, session: SessionDep) -> Message:
     """
     Password Recovery
     """
-    user = crud.get_user_by_email(session=session, email=email)
+    user = users_repository.get_user_by_email(session=session, email=email)
 
     if not user:
         raise HTTPException(
@@ -85,7 +86,7 @@ def reset_password(session: SessionDep, body: NewPassword) -> Message:
     email = verify_password_reset_token(token=body.token)
     if not email:
         raise HTTPException(status_code=400, detail="Invalid token")
-    user = crud.get_user_by_email(session=session, email=email)
+    user = users_repository.get_user_by_email(session=session, email=email)
     if not user:
         raise HTTPException(
             status_code=404,
@@ -109,7 +110,7 @@ def recover_password_html_content(email: str, session: SessionDep) -> Any:
     """
     HTML Content for Password Recovery
     """
-    user = crud.get_user_by_email(session=session, email=email)
+    user = users_repository.get_user_by_email(session=session, email=email)
 
     if not user:
         raise HTTPException(

backend/app/core/db.py

@@ -1,7 +1,9 @@
 from sqlmodel import Session, create_engine, select
 
-from app import crud
+from app.auth.models import *  # noqa: F403
 from app.core.config import settings
+from app.items.models import *  # noqa: F403
+from app.users import repository as users_repository
 from app.users.models import User, UserCreate
 
 engine = create_engine(str(settings.SQLALCHEMY_DATABASE_URI))
@@ -30,4 +32,4 @@ def init_db(session: Session) -> None:
             password=settings.FIRST_SUPERUSER_PASSWORD,
             is_superuser=True,
         )
-        user = crud.create_user(session=session, user_create=user_in)
+        user = users_repository.create_user(session=session, user_create=user_in)

backend/app/items/repository.py

@@ -0,0 +1,13 @@
+import uuid
+
+from sqlmodel import Session
+
+from app.items.models import Item, ItemCreate
+
+
+def create_item(*, session: Session, item_in: ItemCreate, owner_id: uuid.UUID) -> Item:
+    db_item = Item.model_validate(item_in, update={"owner_id": owner_id})
+    session.add(db_item)
+    session.commit()
+    session.refresh(db_item)
+    return db_item

backend/app/tests/api/__init__.py renamed to backend/app/tests/auth/__init__.py

@@ -0,0 +1,25 @@
+from sqlmodel import Session
+
+from app.auth import repository as auth_repository
+from app.tests.utils.utils import random_email, random_lower_string
+from app.users import repository as users_repository
+from app.users.models import UserCreate
+
+
+def test_authenticate_user(db: Session) -> None:
+    email = random_email()
+    password = random_lower_string()
+    user_in = UserCreate(email=email, password=password)
+    user = users_repository.create_user(session=db, user_create=user_in)
+    authenticated_user = auth_repository.authenticate(
+        session=db, email=email, password=password
+    )
+    assert authenticated_user
+    assert user.email == authenticated_user.email
+
+
+def test_not_authenticate_user(db: Session) -> None:
+    email = random_email()
+    password = random_lower_string()
+    user = auth_repository.authenticate(session=db, email=email, password=password)
+    assert user is None