machka-pasla
f4730c3ceb
- Added functionality to update user descriptions on the panel during synchronization, incorporating Telegram fields such as username, first name, and last name. - Implemented error handling and logging for failed description updates in both admin sync and profile sync processes. - Updated user creation and details update methods in the subscription service to include user descriptions, improving consistency across user data management.
66 lines
2.8 KiB
Python
66 lines
2.8 KiB
Python
import logging
|
|
from typing import Callable, Dict, Any, Awaitable, Optional
|
|
|
|
from aiogram import BaseMiddleware
|
|
from aiogram.types import Update, User as TgUser
|
|
from sqlalchemy.ext.asyncio import AsyncSession
|
|
|
|
from db.dal import user_dal
|
|
|
|
|
|
class ProfileSyncMiddleware(BaseMiddleware):
|
|
|
|
async def __call__(
|
|
self,
|
|
handler: Callable[[Update, Dict[str, Any]], Awaitable[Any]],
|
|
event: Update,
|
|
data: Dict[str, Any],
|
|
) -> Any:
|
|
session: AsyncSession = data.get("session")
|
|
tg_user: Optional[TgUser] = data.get("event_from_user")
|
|
|
|
if session and tg_user:
|
|
try:
|
|
db_user = await user_dal.get_user_by_id(session, tg_user.id)
|
|
if db_user:
|
|
update_payload: Dict[str, Any] = {}
|
|
if db_user.username != tg_user.username:
|
|
update_payload["username"] = tg_user.username
|
|
if db_user.first_name != tg_user.first_name:
|
|
update_payload["first_name"] = tg_user.first_name
|
|
if db_user.last_name != tg_user.last_name:
|
|
update_payload["last_name"] = tg_user.last_name
|
|
|
|
if update_payload:
|
|
await user_dal.update_user(session, tg_user.id, update_payload)
|
|
logging.info(
|
|
f"ProfileSyncMiddleware: Updated user {tg_user.id} profile fields: {list(update_payload.keys())}"
|
|
)
|
|
|
|
# Also update description on panel if linked
|
|
try:
|
|
panel_service = data.get("panel_service")
|
|
if panel_service and db_user.panel_user_uuid:
|
|
description_text = "\n".join([
|
|
tg_user.username or "",
|
|
tg_user.first_name or "",
|
|
tg_user.last_name or "",
|
|
])
|
|
await panel_service.update_user_details_on_panel(
|
|
db_user.panel_user_uuid,
|
|
{"description": description_text},
|
|
)
|
|
except Exception as e_upd_desc:
|
|
logging.warning(
|
|
f"ProfileSyncMiddleware: Failed to update panel description for user {tg_user.id}: {e_upd_desc}"
|
|
)
|
|
except Exception as e:
|
|
logging.error(
|
|
f"ProfileSyncMiddleware: Failed to sync profile for user {getattr(tg_user, 'id', 'N/A')}: {e}",
|
|
exc_info=True,
|
|
)
|
|
|
|
return await handler(event, data)
|
|
|
|
|