Update project configuration and codebase
This commit is contained in:
@@ -1,4 +1,3 @@
|
||||
from typing import Optional
|
||||
from sqlalchemy import select
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
|
||||
@@ -8,7 +7,7 @@ from schemas.tickets import NewTicketDTO
|
||||
|
||||
class TicketRepository:
|
||||
async def get_ticket_by_user_id(
|
||||
self, session: AsyncSession, user_id: int, status: Optional[TicketStatus] = None
|
||||
self, session: AsyncSession, user_id: int, status: TicketStatus | None = None
|
||||
) -> list[Ticket]:
|
||||
stmt = select(Ticket).where(Ticket.creator_id == user_id)
|
||||
if status:
|
||||
@@ -19,7 +18,7 @@ class TicketRepository:
|
||||
|
||||
async def get_available_ticket_by_user_id(
|
||||
self, session: AsyncSession, user_id: int
|
||||
) -> Optional[Ticket]:
|
||||
) -> Ticket | None:
|
||||
stmt = (
|
||||
select(Ticket)
|
||||
.where(Ticket.creator_id == user_id)
|
||||
@@ -30,17 +29,13 @@ class TicketRepository:
|
||||
tickets = list(res.scalars().all())
|
||||
return tickets[0] if tickets else None
|
||||
|
||||
async def get_ticket_by_thread_id(
|
||||
self, session: AsyncSession, thread_id: int
|
||||
) -> Optional[Ticket]:
|
||||
async def get_ticket_by_thread_id(self, session: AsyncSession, thread_id: int) -> Ticket | None:
|
||||
stmt = select(Ticket).where(Ticket.thread_id == thread_id)
|
||||
res = await session.execute(stmt)
|
||||
|
||||
return res.scalar_one_or_none()
|
||||
|
||||
async def create_ticket(
|
||||
self, session: AsyncSession, ticket_data: NewTicketDTO
|
||||
) -> Ticket:
|
||||
async def create_ticket(self, session: AsyncSession, ticket_data: NewTicketDTO) -> Ticket:
|
||||
ticket = Ticket(creator_id=ticket_data.creator_id)
|
||||
session.add(ticket)
|
||||
await session.commit()
|
||||
@@ -54,9 +49,7 @@ class TicketRepository:
|
||||
await session.commit()
|
||||
return ticket
|
||||
|
||||
async def update_ticket_thread_id(
|
||||
self, session: AsyncSession, ticket: Ticket, thread_id: int
|
||||
):
|
||||
async def update_ticket_thread_id(self, session: AsyncSession, ticket: Ticket, thread_id: int):
|
||||
ticket.thread_id = thread_id
|
||||
await session.commit()
|
||||
return ticket
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
from typing import Optional
|
||||
from sqlalchemy import select
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
|
||||
@@ -7,9 +6,7 @@ from schemas.users import NewUserDTO
|
||||
|
||||
|
||||
class UserRepository:
|
||||
async def get_user_by_id(
|
||||
self, session: AsyncSession, user_id: int
|
||||
) -> Optional[User]:
|
||||
async def get_user_by_id(self, session: AsyncSession, user_id: int) -> User | None:
|
||||
stmt = select(User).where(User.id == user_id)
|
||||
result = await session.execute(stmt)
|
||||
|
||||
@@ -28,7 +25,7 @@ class UserRepository:
|
||||
|
||||
async def update_user_topic(
|
||||
self, session: AsyncSession, user_id: int, thread_id: int
|
||||
) -> Optional[User]:
|
||||
) -> User | None:
|
||||
user = await self.get_user_by_id(session, user_id=user_id)
|
||||
if not user:
|
||||
return None
|
||||
@@ -37,9 +34,7 @@ class UserRepository:
|
||||
await session.commit()
|
||||
return user
|
||||
|
||||
async def update_user_link(
|
||||
self, session: AsyncSession, user_id: int, link: str
|
||||
) -> Optional[User]:
|
||||
async def update_user_link(self, session: AsyncSession, user_id: int, link: str) -> User | None:
|
||||
user = await self.get_user_by_id(session, user_id=user_id)
|
||||
if not user:
|
||||
return None
|
||||
@@ -50,7 +45,7 @@ class UserRepository:
|
||||
|
||||
async def update_user_balance(
|
||||
self, session: AsyncSession, user_id: int, balance: int
|
||||
) -> Optional[User]:
|
||||
) -> User | None:
|
||||
user = await self.get_user_by_id(session, user_id=user_id)
|
||||
if not user:
|
||||
return None
|
||||
@@ -61,7 +56,7 @@ class UserRepository:
|
||||
|
||||
async def increase_user_balance(
|
||||
self, session: AsyncSession, user_id: int, amount: int
|
||||
) -> Optional[User]:
|
||||
) -> User | None:
|
||||
user = await self.get_user_by_id(session, user_id=user_id)
|
||||
if not user:
|
||||
return None
|
||||
|
||||
Reference in New Issue
Block a user