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

12
backend/app/api/routes/login.py
View File

@@ -5,12 +5,12 @@ from fastapi import APIRouter, Depends, HTTPException
from fastapi.responses import HTMLResponse
from fastapi.security import OAuth2PasswordRequestForm
from app import crud
from app.api.deps import CurrentUser, SessionDep, get_current_active_superuser
from app.core import security
from app.core.config import settings
from app.core.security import get_password_hash
from app.models import Message, NewPassword, Token, UserPublic
from app.models.base import Message
from app.models.user import User, NewPassword, Token, UserPublic
from app.utils import (
generate_password_reset_token,
generate_reset_password_email,
@@ -28,7 +28,7 @@ def login_access_token(
"""
OAuth2 compatible token login, get an access token for future requests
"""
user = crud.authenticate(
user = User.authenticate(
session=session, email=form_data.username, password=form_data.password
)
if not user:
@@ -56,7 +56,7 @@ def recover_password(email: str, session: SessionDep) -> Message:
"""
Password Recovery
"""
user = crud.get_user_by_email(session=session, email=email)
user = User.get_by_email(session=session, email=email)
if not user:
raise HTTPException(
@@ -83,7 +83,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 = User.get_by_email(session=session, email=email)
if not user:
raise HTTPException(
status_code=404,
@@ -107,7 +107,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 = User.get_by_email(session=session, email=email)
if not user:
raise HTTPException(

24
backend/app/api/routes/users.py
View File

@@ -4,7 +4,6 @@ from typing import Any
from fastapi import APIRouter, Depends, HTTPException
from sqlmodel import col, delete, func, select
from app import crud
from app.api.deps import (
CurrentUser,
SessionDep,
@@ -12,9 +11,8 @@ from app.api.deps import (
)
from app.core.config import settings
from app.core.security import get_password_hash, verify_password
from app.models import (
Item,
Message,
from app.models.base import Message
from app.models.user import (
UpdatePassword,
User,
UserCreate,
@@ -55,14 +53,14 @@ def create_user(*, session: SessionDep, user_in: UserCreate) -> Any:
"""
Create new user.
"""
user = crud.get_user_by_email(session=session, email=user_in.email)
user = User.get_by_email(session=session, email=user_in.email)
if user:
raise HTTPException(
status_code=400,
detail="The user with this email already exists in the system.",
)
user = crud.create_user(session=session, user_create=user_in)
user = User.create(session=session, create_obj=user_in)
if settings.emails_enabled and user_in.email:
email_data = generate_new_account_email(
email_to=user_in.email, username=user_in.email, password=user_in.password
@@ -84,7 +82,7 @@ def update_user_me(
"""
if user_in.email:
existing_user = crud.get_user_by_email(session=session, email=user_in.email)
existing_user = User.get_by_email(session=session, email=user_in.email)
if existing_user and existing_user.id != current_user.id:
raise HTTPException(
status_code=409, detail="User with this email already exists"
@@ -144,14 +142,14 @@ def register_user(session: SessionDep, user_in: UserRegister) -> Any:
"""
Create new user without the need to be logged in.
"""
user = crud.get_user_by_email(session=session, email=user_in.email)
user = User.get_by_email(session=session, email=user_in.email)
if user:
raise HTTPException(
status_code=400,
detail="The user with this email already exists in the system",
)
user_create = UserCreate.model_validate(user_in)
user = crud.create_user(session=session, user_create=user_create)
user = User.create(session=session, create_obj=user_create)
return user
@@ -195,13 +193,13 @@ def update_user(
detail="The user with this id does not exist in the system",
)
if user_in.email:
existing_user = crud.get_user_by_email(session=session, email=user_in.email)
existing_user = User.get_by_email(session=session, email=user_in.email)
if existing_user and existing_user.id != user_id:
raise HTTPException(
status_code=409, detail="User with this email already exists"
)
db_user = crud.update_user(session=session, db_user=db_user, user_in=user_in)
db_user = User.update(session=session, db_obj=db_user, in_obj=user_in)
return db_user
@@ -219,8 +217,8 @@ def delete_user(
raise HTTPException(
status_code=403, detail="Super users are not allowed to delete themselves"
)
statement = delete(Item).where(col(Item.owner_id) == user_id)
session.exec(statement) # type: ignore
# statement = delete(Item).where(col(Item.owner_id) == user_id)
# session.exec(statement) # type: ignore
session.delete(user)
session.commit()
return Message(message="User deleted successfully")

9
backend/app/core/db.py
View File

@@ -1,6 +1,7 @@
from sqlmodel import Session, create_engine, select
from app.core.config import settings
from app.models.user import User, UserCreate
engine = create_engine(str(settings.SQLALCHEMY_DATABASE_URI))
@@ -15,10 +16,10 @@ def init_db(session: Session) -> None:
# Tables should be created with Alembic migrations
# But if you don't want to use migrations, create
# the tables un-commenting the next lines
# from sqlmodel import SQLModel
from app.models.base import BaseSQLModel
# This works because the models are already imported and registered from app.models
# SQLModel.metadata.create_all(engine)
BaseSQLModel.metadata.create_all(engine)
user = session.exec(
select(User).where(User.email == settings.FIRST_SUPERUSER)
@@ -27,5 +28,7 @@ def init_db(session: Session) -> None:
user_in = UserCreate(
email=settings.FIRST_SUPERUSER,
password=settings.FIRST_SUPERUSER_PASSWORD,
is_verified=True,
is_active=True,
)
user = User.create_user(session=session, user_create=user_in)
user = User.create(session=session, create_obj=user_in)

10
backend/app/models/mixin.py
View File

@@ -19,11 +19,15 @@ class IsVerified(BaseModel):
class UserName(BaseModel):
username: str | None = Field(default=None, nullable=True, unique=True, max_length=255)
username: str | None = Field(
default=None, nullable=True, unique=True, max_length=255
)
class Email(BaseModel):
email: EmailStr | None = Field(default=None, nullable=True, unique=True, max_length=255)
email: EmailStr | None = Field(
default=None, nullable=True, unique=True, max_length=255
)
class EmailUpdate(Email):
@@ -37,6 +41,7 @@ class ScoutingId(BaseModel):
class Password(BaseModel):
password: str = Field(min_length=8, max_length=100)
class PasswordUpdate(Password):
password: str | None = Field(default=None, min_length=8, max_length=40)
@@ -48,5 +53,6 @@ class RowId(BaseModel):
default_factory=uuid.uuid4,
)
class RowIdPublic(RowId):
id: RowIdType

24
backend/app/models/user.py
View File

@@ -24,7 +24,7 @@ class UserBase(
mixin.ScoutingId,
mixin.IsActive,
mixin.IsVerified,
BaseSQLModel
BaseSQLModel,
):
pass
@@ -119,3 +119,25 @@ class UsersPublic(BaseSQLModel):
# endregion
# region Password manager ######################################################
# JSON payload containing access token
class Token(BaseSQLModel):
access_token: str
token_type: str = "bearer"
# Contents of JWT token
class TokenPayload(BaseSQLModel):
sub: str | None = None
class NewPassword(BaseSQLModel):
token: str
new_password: str = Field(min_length=8, max_length=40)
# endregion

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)

88
docker-compose.override.yml
View File

@@ -1,49 +1,49 @@
services:
# Local services are available on their ports, but also available on:
# http://api.localhost.tiangolo.com: backend
# http://dashboard.localhost.tiangolo.com: frontend
# etc. To enable it, update .env, set:
# DOMAIN=localhost.tiangolo.com
proxy:
image: traefik:3.0
volumes:
- /var/run/docker.sock:/var/run/docker.sock
ports:
- "80:80"
- "8090:8080"
# Duplicate the command from docker-compose.yml to add --api.insecure=true
command:
# Enable Docker in Traefik, so that it reads labels from Docker services
- --providers.docker
# Add a constraint to only use services with the label for this stack
- --providers.docker.constraints=Label(`traefik.constraint-label`, `traefik-public`)
# Do not expose all Docker services, only the ones explicitly exposed
- --providers.docker.exposedbydefault=false
# Create an entrypoint "http" listening on port 80
- --entrypoints.http.address=:80
# Create an entrypoint "https" listening on port 443
- --entrypoints.https.address=:443
# Enable the access log, with HTTP requests
- --accesslog
# Enable the Traefik log, for configurations and errors
- --log
# Enable debug logging for local development
- --log.level=DEBUG
# Enable the Dashboard and API
- --api
# Enable the Dashboard and API in insecure mode for local development
- --api.insecure=true
labels:
# Enable Traefik for this service, to make it available in the public network
- traefik.enable=true
- traefik.constraint-label=traefik-public
# Dummy https-redirect middleware that doesn't really redirect, only to
# allow running it locally
- traefik.http.middlewares.https-redirect.contenttype.autodetect=false
networks:
- traefik-public
- default
# # Local services are available on their ports, but also available on:
# # http://api.localhost.tiangolo.com: backend
# # http://dashboard.localhost.tiangolo.com: frontend
# # etc. To enable it, update .env, set:
# # DOMAIN=localhost.tiangolo.com
# proxy:
# image: traefik:3.0
# volumes:
# - /var/run/docker.sock:/var/run/docker.sock
# ports:
# - "80:80"
# - "8090:8080"
# # Duplicate the command from docker-compose.yml to add --api.insecure=true
# command:
# # Enable Docker in Traefik, so that it reads labels from Docker services
# - --providers.docker
# # Add a constraint to only use services with the label for this stack
# - --providers.docker.constraints=Label(`traefik.constraint-label`, `traefik-public`)
# # Do not expose all Docker services, only the ones explicitly exposed
# - --providers.docker.exposedbydefault=false
# # Create an entrypoint "http" listening on port 80
# - --entrypoints.http.address=:80
# # Create an entrypoint "https" listening on port 443
# - --entrypoints.https.address=:443
# # Enable the access log, with HTTP requests
# - --accesslog
# # Enable the Traefik log, for configurations and errors
# - --log
# # Enable debug logging for local development
# - --log.level=DEBUG
# # Enable the Dashboard and API
# - --api
# # Enable the Dashboard and API in insecure mode for local development
# - --api.insecure=true
# labels:
# # Enable Traefik for this service, to make it available in the public network
# - traefik.enable=true
# - traefik.constraint-label=traefik-public
# # Dummy https-redirect middleware that doesn't really redirect, only to
# # allow running it locally
# - traefik.http.middlewares.https-redirect.contenttype.autodetect=false
# networks:
# - traefik-public
# - default
db:
restart: "no"

2
docker-compose.yml
View File

@@ -168,4 +168,4 @@ volumes:
networks:
traefik-public:
# Allow setting it to false for testing
external: true
# external: true