rsw/score
1
0
Fork 0
Code Issues 2 Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Remove some old crud functions

Browse Source
This commit is contained in:
Sebastiaan
2025-05-24 11:04:23 +02:00
parent c1442f430e
commit 28eb10fcce
12 changed files with 135 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
backend/app/tests/api/routes/test_login.py
View File

@@ -5,8 +5,7 @@ from sqlmodel import Session
from app.core.config import settings
from app.core.security import verify_password
from app.crud import create_user
from app.models import UserCreate
from app.models.user import User, UserCreate
from app.tests.utils.user import user_authentication_headers
from app.tests.utils.utils import random_email, random_lower_string
from app.utils import generate_password_reset_token
@@ -84,7 +83,7 @@ def test_reset_password(client: TestClient, db: Session) -> None:
is_active=True,
is_superuser=False,
)
user = create_user(session=db, user_create=user_create)
user = User.create(session=db, create_obj=user_create)
token = generate_password_reset_token(email=email)
headers = user_authentication_headers(client=client, email=email, password=password)
data = {"new_password": new_password, "token": token}

35
backend/app/tests/api/routes/test_users.py
View File

@@ -4,10 +4,9 @@ from unittest.mock import patch
from fastapi.testclient import TestClient
from sqlmodel import Session, select
from app import crud
from app.core.config import settings
from app.core.security import verify_password
from app.models import User, UserCreate
from app.models.user import User, UserCreate
from app.tests.utils.utils import random_email, random_lower_string
@@ -51,7 +50,7 @@ def test_create_user_new_email(
)
assert 200 <= r.status_code < 300
created_user = r.json()
user = crud.get_user_by_email(session=db, email=username)
user = User.get_by_email(session=db, email=username)
assert user
assert user.email == created_user["email"]
@@ -62,7 +61,7 @@ def test_get_existing_user(
username = random_email()
password = random_lower_string()
user_in = UserCreate(email=username, password=password)
user = crud.create_user(session=db, user_create=user_in)
user = User.create(session=db, create_obj=user_in)
user_id = user.id
r = client.get(
f"{settings.API_V1_STR}/users/{user_id}",
@@ -70,7 +69,7 @@ def test_get_existing_user(
)
assert 200 <= r.status_code < 300
api_user = r.json()
existing_user = crud.get_user_by_email(session=db, email=username)
existing_user = User.get_by_email(session=db, email=username)
assert existing_user
assert existing_user.email == api_user["email"]
@@ -79,7 +78,7 @@ def test_get_existing_user_current_user(client: TestClient, db: Session) -> None
username = random_email()
password = random_lower_string()
user_in = UserCreate(email=username, password=password)
user = crud.create_user(session=db, user_create=user_in)
user = User.create(session=db, create_obj=user_in)
user_id = user.id
login_data = {
@@ -97,7 +96,7 @@ def test_get_existing_user_current_user(client: TestClient, db: Session) -> None
)
assert 200 <= r.status_code < 300
api_user = r.json()
existing_user = crud.get_user_by_email(session=db, email=username)
existing_user = User.get_by_email(session=db, email=username)
assert existing_user
assert existing_user.email == api_user["email"]
@@ -120,7 +119,7 @@ def test_create_user_existing_username(
# username = email
password = random_lower_string()
user_in = UserCreate(email=username, password=password)
crud.create_user(session=db, user_create=user_in)
User.create(session=db, create_obj=user_in)
data = {"email": username, "password": password}
r = client.post(
f"{settings.API_V1_STR}/users/",
@@ -152,12 +151,12 @@ def test_retrieve_users(
username = random_email()
password = random_lower_string()
user_in = UserCreate(email=username, password=password)
crud.create_user(session=db, user_create=user_in)
User.create(session=db, create_obj=user_in)
username2 = random_email()
password2 = random_lower_string()
user_in2 = UserCreate(email=username2, password=password2)
crud.create_user(session=db, user_create=user_in2)
User.create(session=db, create_obj=user_in2)
r = client.get(f"{settings.API_V1_STR}/users/", headers=superuser_token_headers)
all_users = r.json()
@@ -251,7 +250,7 @@ def test_update_user_me_email_exists(
username = random_email()
password = random_lower_string()
user_in = UserCreate(email=username, password=password)
user = crud.create_user(session=db, user_create=user_in)
user = User.create(session=db, create_obj=user_in)
data = {"email": user.email}
r = client.patch(
@@ -326,7 +325,7 @@ def test_update_user(
username = random_email()
password = random_lower_string()
user_in = UserCreate(email=username, password=password)
user = crud.create_user(session=db, user_create=user_in)
user = User.create(session=db, create_obj=user_in)
data = {"full_name": "Updated_full_name"}
r = client.patch(
@@ -365,12 +364,12 @@ def test_update_user_email_exists(
username = random_email()
password = random_lower_string()
user_in = UserCreate(email=username, password=password)
user = crud.create_user(session=db, user_create=user_in)
user = User.create(session=db, create_obj=user_in)
username2 = random_email()
password2 = random_lower_string()
user_in2 = UserCreate(email=username2, password=password2)
user2 = crud.create_user(session=db, user_create=user_in2)
user2 = User.create(session=db, create_obj=user_in2)
data = {"email": user2.email}
r = client.patch(
@@ -386,7 +385,7 @@ def test_delete_user_me(client: TestClient, db: Session) -> None:
username = random_email()
password = random_lower_string()
user_in = UserCreate(email=username, password=password)
user = crud.create_user(session=db, user_create=user_in)
user = User.create(session=db, create_obj=user_in)
user_id = user.id
login_data = {
@@ -431,7 +430,7 @@ def test_delete_user_super_user(
username = random_email()
password = random_lower_string()
user_in = UserCreate(email=username, password=password)
user = crud.create_user(session=db, user_create=user_in)
user = User.create(session=db, create_obj=user_in)
user_id = user.id
r = client.delete(
f"{settings.API_V1_STR}/users/{user_id}",
@@ -458,7 +457,7 @@ def test_delete_user_not_found(
def test_delete_user_current_super_user_error(
client: TestClient, superuser_token_headers: dict[str, str], db: Session
) -> None:
super_user = crud.get_user_by_email(session=db, email=settings.FIRST_SUPERUSER)
super_user = User.get_by_email(session=db, email=settings.FIRST_SUPERUSER)
assert super_user
user_id = super_user.id
@@ -476,7 +475,7 @@ def test_delete_user_without_privileges(
username = random_email()
password = random_lower_string()
user_in = UserCreate(email=username, password=password)
user = crud.create_user(session=db, user_create=user_in)
user = User.create(session=db, create_obj=user_in)
r = client.delete(
f"{settings.API_V1_STR}/users/{user.id}",

25
backend/app/tests/crud/test_user.py
View File

@@ -1,9 +1,8 @@
from fastapi.encoders import jsonable_encoder
from sqlmodel import Session
from app import crud
from app.core.security import verify_password
from app.models import User, UserCreate, UserUpdate
from app.models.user import User, UserCreate, UserUpdate
from app.tests.utils.utils import random_email, random_lower_string
@@ -11,7 +10,7 @@ def test_create_user(db: Session) -> None:
email = random_email()
password = random_lower_string()
user_in = UserCreate(email=email, password=password)
user = crud.create_user(session=db, user_create=user_in)
user = User.create(session=db, create_obj=user_in)
assert user.email == email
assert hasattr(user, "hashed_password")
@@ -20,8 +19,8 @@ def test_authenticate_user(db: Session) -> None:
email = random_email()
password = random_lower_string()
user_in = UserCreate(email=email, password=password)
user = crud.create_user(session=db, user_create=user_in)
authenticated_user = crud.authenticate(session=db, email=email, password=password)
user = User.create(session=db, create_obj=user_in)
authenticated_user = User.authenticate(session=db, email=email, password=password)
assert authenticated_user
assert user.email == authenticated_user.email
@@ -29,7 +28,7 @@ def test_authenticate_user(db: Session) -> None:
def test_not_authenticate_user(db: Session) -> None:
email = random_email()
password = random_lower_string()
user = crud.authenticate(session=db, email=email, password=password)
user = User.authenticate(session=db, email=email, password=password)
assert user is None
@@ -37,7 +36,7 @@ def test_check_if_user_is_active(db: Session) -> None:
email = random_email()
password = random_lower_string()
user_in = UserCreate(email=email, password=password)
user = crud.create_user(session=db, user_create=user_in)
user = User.create(session=db, create_obj=user_in)
assert user.is_active is True
@@ -45,7 +44,7 @@ def test_check_if_user_is_active_inactive(db: Session) -> None:
email = random_email()
password = random_lower_string()
user_in = UserCreate(email=email, password=password, disabled=True)
user = crud.create_user(session=db, user_create=user_in)
user = User.create(session=db, create_obj=user_in)
assert user.is_active
@@ -53,7 +52,7 @@ def test_check_if_user_is_superuser(db: Session) -> None:
email = random_email()
password = random_lower_string()
user_in = UserCreate(email=email, password=password, is_superuser=True)
user = crud.create_user(session=db, user_create=user_in)
user = User.create(session=db, create_obj=user_in)
assert user.is_superuser is True
@@ -61,7 +60,7 @@ def test_check_if_user_is_superuser_normal_user(db: Session) -> None:
username = random_email()
password = random_lower_string()
user_in = UserCreate(email=username, password=password)
user = crud.create_user(session=db, user_create=user_in)
user = User.create(session=db, create_obj=user_in)
assert user.is_superuser is False
@@ -69,7 +68,7 @@ def test_get_user(db: Session) -> None:
password = random_lower_string()
username = random_email()
user_in = UserCreate(email=username, password=password, is_superuser=True)
user = crud.create_user(session=db, user_create=user_in)
user = User.create(session=db, create_obj=user_in)
user_2 = db.get(User, user.id)
assert user_2
assert user.email == user_2.email
@@ -80,11 +79,11 @@ def test_update_user(db: Session) -> None:
password = random_lower_string()
email = random_email()
user_in = UserCreate(email=email, password=password, is_superuser=True)
user = crud.create_user(session=db, user_create=user_in)
user = User.create(session=db, create_obj=user_in)
new_password = random_lower_string()
user_in_update = UserUpdate(password=new_password, is_superuser=True)
if user.id is not None:
crud.update_user(session=db, db_user=user, user_in=user_in_update)
User.update(session=db, db_obj=user, in_obj=user_in_update)
user_2 = db.get(User, user.id)
assert user_2
assert user.email == user_2.email

16
backend/app/tests/utils/item.py
View File

@@ -1,16 +0,0 @@
from sqlmodel import Session
from app import crud
from app.models import Item, ItemCreate
from app.tests.utils.user import create_random_user
from app.tests.utils.utils import random_lower_string
def create_random_item(db: Session) -> Item:
user = create_random_user(db)
owner_id = user.id
assert owner_id is not None
title = random_lower_string()
description = random_lower_string()
item_in = ItemCreate(title=title, description=description)
return crud.create_item(session=db, item_in=item_in, owner_id=owner_id)

11
backend/app/tests/utils/user.py
View File

@@ -1,9 +1,8 @@
from fastapi.testclient import TestClient
from sqlmodel import Session
from app import crud
from app.core.config import settings
from app.models import User, UserCreate, UserUpdate
from app.models.user import User, UserCreate, UserUpdate
from app.tests.utils.utils import random_email, random_lower_string
@@ -23,7 +22,7 @@ def create_random_user(db: Session) -> User:
email = random_email()
password = random_lower_string()
user_in = UserCreate(email=email, password=password)
user = crud.create_user(session=db, user_create=user_in)
user = User.create(session=db, create_obj=user_in)
return user
@@ -36,14 +35,14 @@ def authentication_token_from_email(
If the user doesn't exist it is created first.
"""
password = random_lower_string()
user = crud.get_user_by_email(session=db, email=email)
user = User.get_by_email(session=db, email=email)
if not user:
user_in_create = UserCreate(email=email, password=password)
user = crud.create_user(session=db, user_create=user_in_create)
user = User.create(session=db, create_obj=user_in_create)
else:
user_in_update = UserUpdate(password=password)
if not user.id:
raise Exception("User id not set")
user = crud.update_user(session=db, db_user=user, user_in=user_in_update)
user = User.update(session=db, db_obj=user, in_obj=user_in_update)
return user_authentication_headers(client=client, email=email, password=password)