fix!: removed .commit() from repository level
This commit is contained in:
@@ -3,10 +3,9 @@ import logging
|
||||
|
||||
from fastapi import Depends, Form, HTTPException
|
||||
from fastapi.routing import APIRouter
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
|
||||
from core.deps import get_db
|
||||
from db.models.transactions import BalanceTransaction, BalanceTxType
|
||||
from db.models.transactions import BalanceTxType
|
||||
from db.session import UnitOfWork, get_uow
|
||||
from external.pally import BillStatus
|
||||
from repositories.invoices import InvoiceRepository
|
||||
from repositories.users import UserRepository
|
||||
@@ -39,7 +38,7 @@ async def pally_callback(
|
||||
PayerComment: str | None = Form(None),
|
||||
ErrorCode: int | None = Form(None),
|
||||
ErrorMessage: str | None = Form(None),
|
||||
session: AsyncSession = Depends(get_db),
|
||||
uow: UnitOfWork = Depends(get_uow),
|
||||
):
|
||||
logger.info(
|
||||
"Pally webhook received - InvId: %s, OutSum: %s, Commission: %s, TrsId: %s, Status: %s, "
|
||||
@@ -88,7 +87,7 @@ async def pally_callback(
|
||||
|
||||
try:
|
||||
await process_subscription_purchase(
|
||||
session,
|
||||
uow,
|
||||
invoice_id=int(invoice_id_str),
|
||||
trs_id=TrsId,
|
||||
amount=amount,
|
||||
@@ -102,9 +101,9 @@ async def pally_callback(
|
||||
invoice_id_str,
|
||||
TrsId,
|
||||
)
|
||||
await session.rollback()
|
||||
await uow.rollback()
|
||||
|
||||
invoice_repo = InvoiceRepository(session)
|
||||
invoice_repo = InvoiceRepository(uow)
|
||||
invoice = await invoice_repo.get_by_id(int(invoice_id_str))
|
||||
if invoice is None:
|
||||
logger.critical(
|
||||
@@ -117,7 +116,8 @@ async def pally_callback(
|
||||
if invoice.status == InvoiceStatus.PAID:
|
||||
return "OK"
|
||||
|
||||
user = await UserRepository(session).get_user_by_id(invoice.creator_id)
|
||||
users_repo = UserRepository(uow)
|
||||
user = await users_repo.get_user_by_id(invoice.creator_id)
|
||||
if user is None:
|
||||
logger.critical(
|
||||
"Cannot credit fallback balance: user %s was not found " "for bill %s (TrsId: %s)",
|
||||
@@ -127,22 +127,14 @@ async def pally_callback(
|
||||
)
|
||||
raise
|
||||
|
||||
balance_before = user.balance
|
||||
user.balance += amount
|
||||
invoice.status = InvoiceStatus.PAID
|
||||
session.add(
|
||||
BalanceTransaction(
|
||||
user_id=user.id,
|
||||
amount=amount,
|
||||
tx_type=BalanceTxType.DEPOSIT,
|
||||
balance_before=balance_before,
|
||||
balance_after=user.balance,
|
||||
description=(
|
||||
f"fallback payment credit for invoice {invoice.id} " f"(TrsId: {TrsId})"
|
||||
),
|
||||
)
|
||||
await users_repo.increase_balance(
|
||||
user.id,
|
||||
amount,
|
||||
BalanceTxType.DEPOSIT,
|
||||
f"fallback payment credit for invoice {invoice.id} (TrsId: {TrsId})",
|
||||
)
|
||||
await session.commit()
|
||||
await invoice_repo.update_status_by_id(invoice.id, InvoiceStatus.PAID)
|
||||
await uow.commit()
|
||||
logger.info(
|
||||
"Fallback payment credit processed: user_id=%s, amount=%s, " "invoice_id=%s, TrsId=%s",
|
||||
user.id,
|
||||
|
||||
Reference in New Issue
Block a user