VPN/remnawave-bedolaga-telegram-bot
1
0
Fork 0
mirror of https://github.com/BEDOLAGA-DEV/remnawave-bedolaga-telegram-bot.git synced 2026-02-21 11:51:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle optional Pal24 metadata fields

Browse Source
This commit is contained in:
Egor
2025-11-09 08:23:01 +03:00
parent 9f78335651
commit cde84ff20b
2 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/database/database.py
View File

@@ -2,16 +2,19 @@ import logging
from typing import AsyncGenerator
from sqlalchemy.ext.asyncio import AsyncSession, create_async_engine, async_sessionmaker
from sqlalchemy.pool import NullPool
from sqlalchemy.pool import AsyncAdaptedQueuePool
from app.config import settings
from app.database.models import Base
logger = logging.getLogger(__name__)
QueuePool = AsyncAdaptedQueuePool
engine = create_async_engine(
settings.get_database_url(),
poolclass=NullPool,
poolclass=QueuePool,
echo=settings.DEBUG,
future=True
)

20
app/services/payment/pal24.py
View File

@@ -250,6 +250,10 @@ class Pal24PaymentMixin:
return True
if status in {"PAID", "SUCCESS", "OVERPAID"}:
metadata = getattr(payment, "metadata_json", {}) or {}
if not isinstance(metadata, dict):
metadata = {}
payment = await payment_module.update_pal24_payment_status(
db,
payment,
@@ -262,7 +266,7 @@ class Pal24PaymentMixin:
payment_method=(
postback.get("payment_method")
or postback.get("PaymentMethod")
or (payment.metadata_json or {}).get("selected_method")
or metadata.get("selected_method")
or getattr(payment, "payment_method", None)
),
balance_amount=postback.get("BalanceAmount")
@@ -281,6 +285,10 @@ class Pal24PaymentMixin:
trigger="postback",
)
metadata = getattr(payment, "metadata_json", {}) or {}
if not isinstance(metadata, dict):
metadata = {}
await payment_module.update_pal24_payment_status(
db,
payment,
@@ -709,8 +717,9 @@ class Pal24PaymentMixin:
"secondary_url": secondary_url,
"sbp_url": links_map.get("sbp"),
"card_url": links_map.get("card"),
"link_page_url": links_map.get("page") or payment.link_page_url,
"link_url": payment.link_url,
"link_page_url": links_map.get("page")
or getattr(payment, "link_page_url", None),
"link_url": getattr(payment, "link_url", None),
"selected_method": selected_method,
}
@@ -878,7 +887,10 @@ class Pal24PaymentMixin:
) -> tuple[Dict[str, str], str]:
links: Dict[str, str] = {}
metadata = payment.metadata_json if isinstance(payment.metadata_json, dict) else {}
metadata = getattr(payment, "metadata_json", {}) or {}
if not isinstance(metadata, dict):
metadata = {}
if metadata:
links_meta = metadata.get("links")
if isinstance(links_meta, dict):