fix: Исправлены сообщения об ошибках аутентификации chore: Добавлена сортировка пользователей по ID
60 lines
1.7 KiB
Python
60 lines
1.7 KiB
Python
from typing import Optional, Sequence
|
|
|
|
from sqlalchemy.ext.asyncio import AsyncSession
|
|
from sqlalchemy.future import select
|
|
from sqlalchemy.orm import joinedload
|
|
|
|
from app.domain.models.users import User
|
|
|
|
|
|
class UsersRepository:
|
|
def __init__(self, db: AsyncSession):
|
|
self.db = db
|
|
|
|
async def get_all(self) -> Sequence[User]:
|
|
stmt = (
|
|
select(User)
|
|
.options(joinedload(User.role))
|
|
.order_by(User.id)
|
|
)
|
|
result = await self.db.execute(stmt)
|
|
return result.scalars().all()
|
|
|
|
async def get_by_id(self, user_id: int) -> Optional[User]:
|
|
stmt = (
|
|
select(User)
|
|
.filter_by(id=user_id)
|
|
.options(joinedload(User.role))
|
|
)
|
|
result = await self.db.execute(stmt)
|
|
return result.scalars().first()
|
|
|
|
async def get_by_login(self, user_login: str) -> Optional[User]:
|
|
stmt = (
|
|
select(User)
|
|
.filter_by(login=user_login)
|
|
.options(joinedload(User.role))
|
|
)
|
|
result = await self.db.execute(stmt)
|
|
return result.scalars().first()
|
|
|
|
async def get_by_id_with_role(self, user_id: int) -> Optional[User]:
|
|
stmt = (
|
|
select(User)
|
|
.filter_by(id=user_id)
|
|
.options(joinedload(User.role))
|
|
)
|
|
result = await self.db.execute(stmt)
|
|
return result.scalars().first()
|
|
|
|
async def create(self, user: User) -> User:
|
|
self.db.add(user)
|
|
await self.db.commit()
|
|
await self.db.refresh(user)
|
|
return user
|
|
|
|
async def update(self, user: User) -> User:
|
|
await self.db.merge(user)
|
|
await self.db.commit()
|
|
return user
|