refactor: balance handling and upload processing

This commit is contained in:
2026-07-24 16:48:32 +05:00
parent 8bd5c80693
commit 9009147b52
9 changed files with 341 additions and 122 deletions
+16 -16
View File
@@ -18,14 +18,14 @@ class InsufficientBalance(BalanceError):
def _amount(value: int) -> int:
if isinstance(value, bool) or not isinstance(value, int) or value <= 0:
raise BalanceError("Amount must be a positive integer")
raise BalanceError("Сумма должна быть положительным целым числом")
return value
async def _get_or_create_user(session, telegram_id: int) -> User:
user = await session.scalar(select(User).where(User.telegram_id == telegram_id))
if user is None:
user = User(telegram_id=telegram_id, balance_credits=0)
user = User(telegram_id=telegram_id, balance_rubles=0)
session.add(user)
await session.flush()
return user
@@ -34,7 +34,7 @@ async def _get_or_create_user(session, telegram_id: int) -> User:
async def get_user_balance(telegram_id: int) -> int:
async with async_session() as session:
user = await session.scalar(select(User).where(User.telegram_id == telegram_id))
return int(user.balance_credits) if user else 0
return int(user.balance_rubles) if user else 0
async def change_user_balance(
@@ -46,26 +46,26 @@ async def change_user_balance(
and telegram_id != actor_telegram_id
and actor_telegram_id != ADMIN_ID
):
raise PermissionError("Only an administrator can adjust another user")
raise PermissionError("Только администратор может изменять баланс другого пользователя")
async with async_session() as session:
user = await _get_or_create_user(session, telegram_id)
await session.execute(
update(User).where(User.id == user.id).values(balance_credits=amount)
update(User).where(User.id == user.id).values(balance_rubles=amount)
)
await session.commit()
return int(
(
await session.scalar(
select(User.balance_credits).where(User.id == user.id)
select(User.balance_rubles).where(User.id == user.id)
)
)
or 0
)
async def credit_user(
async def increase_balance(
telegram_id: int, amount: int, *, actor_telegram_id: int | None = None
) -> int:
amount = _amount(amount)
@@ -74,20 +74,20 @@ async def credit_user(
and telegram_id != actor_telegram_id
and actor_telegram_id != ADMIN_ID
):
raise PermissionError("Only an administrator can adjust another user")
raise PermissionError("Только администратор может изменять баланс другого пользователя")
async with async_session() as session:
user = await _get_or_create_user(session, telegram_id)
await session.execute(
update(User)
.where(User.id == user.id)
.values(balance_credits=User.balance_credits + amount)
.values(balance_rubles=User.balance_rubles + amount)
)
await session.commit()
return int(
(
await session.scalar(
select(User.balance_credits).where(User.id == user.id)
select(User.balance_rubles).where(User.id == user.id)
)
)
or 0
@@ -103,23 +103,23 @@ async def debit_user(
and telegram_id != actor_telegram_id
and actor_telegram_id != ADMIN_ID
):
raise PermissionError("Only an administrator can adjust another user")
raise PermissionError("Только администратор может изменять баланс другого пользователя")
async with async_session() as session:
user = await _get_or_create_user(session, telegram_id)
result = await session.execute(
update(User)
.where(User.id == user.id, User.balance_credits >= amount)
.values(balance_credits=User.balance_credits - amount)
.where(User.id == user.id, User.balance_rubles >= amount)
.values(balance_rubles=User.balance_rubles - amount)
)
if result.rowcount != 1:
await session.rollback()
raise InsufficientBalance("Insufficient balance")
raise InsufficientBalance("Недостаточно рублей на балансе")
await session.commit()
return int(
(
await session.scalar(
select(User.balance_credits).where(User.id == user.id)
select(User.balance_rubles).where(User.id == user.id)
)
)
or 0
@@ -166,4 +166,4 @@ async def get_user_profile(telegram_id: int) -> tuple[int, int, int]:
count = await session.scalar(
select(func.count(BotAccount.id)).where(BotAccount.owner_id == user.id)
)
return telegram_id, int(user.balance_credits), int(count or 0)
return telegram_id, int(user.balance_rubles), int(count or 0)