42 lines
1.4 KiB
Python
42 lines
1.4 KiB
Python
from sqlalchemy.exc import IntegrityError
|
|
from sqlalchemy.ext.asyncio import AsyncSession
|
|
|
|
from app.core import security
|
|
from app.errors.exceptions import conflict
|
|
from app.models.user import User as UserModel
|
|
from app.schemas.user import CreateUser, User
|
|
from app.storage import users as users_storage
|
|
|
|
USERNAME_TAKEN_MESSAGE = "Имя пользователя уже занято"
|
|
|
|
|
|
def to_user_schema(user: UserModel) -> User:
|
|
"""Преобразует ORM-модель в публичную схему без password_hash."""
|
|
user_schema = User.model_validate(user)
|
|
return user_schema
|
|
|
|
|
|
async def register_user(session: AsyncSession, new_user: CreateUser) -> User:
|
|
"""Регистрирует пользователя; занятый username даёт 409."""
|
|
existing_user = await users_storage.get_user_by_username(session, new_user.username)
|
|
await session.commit()
|
|
if existing_user is not None:
|
|
raise conflict(USERNAME_TAKEN_MESSAGE)
|
|
|
|
password_hash = await security.hash_password(new_user.password)
|
|
|
|
try:
|
|
user = await users_storage.create_user(
|
|
session,
|
|
username=new_user.username,
|
|
display_name=new_user.display_name,
|
|
password_hash=password_hash,
|
|
)
|
|
await session.commit()
|
|
except IntegrityError:
|
|
await session.rollback()
|
|
raise conflict(USERNAME_TAKEN_MESSAGE) from None
|
|
|
|
created_user = to_user_schema(user)
|
|
return created_user
|