eb18994b7d
- Migrate 660+ datetime.utcnow() across 153 files to datetime.now(UTC) - Migrate 30+ datetime.now() without UTC to datetime.now(UTC) - Convert all 170 DateTime columns to DateTime(timezone=True) - Add migrate_datetime_to_timestamptz() in universal_migration with SET LOCAL timezone='UTC' safety - Remove 70+ .replace(tzinfo=None) workarounds - Fix utcfromtimestamp → fromtimestamp(..., tz=UTC) - Fix fromtimestamp() without tz= (system_logs, backup_service, referral_diagnostics) - Fix fromisoformat/isoparse to ensure aware output (platega, yookassa, wata, miniapp, nalogo) - Fix strptime() to add .replace(tzinfo=UTC) (backup_service, referral_diagnostics) - Fix datetime.combine() to include tzinfo=UTC (remnawave_sync, traffic_monitoring) - Fix datetime.max/datetime.min sentinels with .replace(tzinfo=UTC) - Rename panel_datetime_to_naive_utc → panel_datetime_to_utc - Remove DTZ003 from ruff ignore list
186 lines
6.6 KiB
Python
186 lines
6.6 KiB
Python
from datetime import UTC, datetime
|
|
|
|
import structlog
|
|
from aiogram import Bot
|
|
from aiogram.client.default import DefaultBotProperties
|
|
from sqlalchemy import select
|
|
from sqlalchemy.ext.asyncio import AsyncSession
|
|
|
|
from app.config import settings
|
|
from app.database.crud.transaction import get_user_total_spent_kopeks
|
|
from app.database.models import PromoGroup, User
|
|
from app.services.admin_notification_service import AdminNotificationService
|
|
|
|
|
|
logger = structlog.get_logger(__name__)
|
|
|
|
|
|
async def _notify_admins_about_auto_assignment(
|
|
db: AsyncSession,
|
|
user: User,
|
|
old_group: PromoGroup | None,
|
|
new_group: PromoGroup,
|
|
total_spent_kopeks: int,
|
|
):
|
|
if not getattr(settings, 'ADMIN_NOTIFICATIONS_ENABLED', False):
|
|
return
|
|
|
|
bot_token = getattr(settings, 'BOT_TOKEN', None)
|
|
if not bot_token:
|
|
logger.debug('BOT_TOKEN не настроен — пропускаем уведомление о промогруппе')
|
|
return
|
|
|
|
bot = Bot(token=bot_token, default=DefaultBotProperties(parse_mode='HTML'))
|
|
try:
|
|
notification_service = AdminNotificationService(bot)
|
|
reason = (
|
|
f'Автоназначение за траты {settings.format_price(total_spent_kopeks)}'
|
|
if hasattr(settings, 'format_price')
|
|
else f'Автоназначение за траты {total_spent_kopeks / 100:.2f}₽'
|
|
)
|
|
await notification_service.send_user_promo_group_change_notification(
|
|
db,
|
|
user,
|
|
old_group,
|
|
new_group,
|
|
reason=reason,
|
|
initiator=None,
|
|
automatic=True,
|
|
)
|
|
except Exception as exc:
|
|
logger.error(
|
|
'Ошибка отправки уведомления о автоназначении промогруппы пользователю',
|
|
telegram_id=user.telegram_id,
|
|
exc=exc,
|
|
)
|
|
finally:
|
|
try:
|
|
await bot.session.close()
|
|
except Exception:
|
|
pass
|
|
|
|
|
|
async def _get_best_group_for_spending(
|
|
db: AsyncSession,
|
|
total_spent_kopeks: int,
|
|
min_threshold_kopeks: int = 0,
|
|
) -> PromoGroup | None:
|
|
if total_spent_kopeks <= 0:
|
|
return None
|
|
|
|
result = await db.execute(
|
|
select(PromoGroup)
|
|
.where(PromoGroup.auto_assign_total_spent_kopeks.is_not(None))
|
|
.where(PromoGroup.auto_assign_total_spent_kopeks > 0)
|
|
.order_by(PromoGroup.auto_assign_total_spent_kopeks.desc(), PromoGroup.id.desc())
|
|
)
|
|
groups = result.scalars().all()
|
|
|
|
for group in groups:
|
|
threshold = group.auto_assign_total_spent_kopeks or 0
|
|
if threshold and total_spent_kopeks >= threshold and threshold > min_threshold_kopeks:
|
|
return group
|
|
|
|
return None
|
|
|
|
|
|
async def maybe_assign_promo_group_by_total_spent(
|
|
db: AsyncSession,
|
|
user_id: int,
|
|
) -> PromoGroup | None:
|
|
from app.database.crud.user_promo_group import (
|
|
add_user_to_promo_group,
|
|
has_user_promo_group,
|
|
sync_user_primary_promo_group,
|
|
)
|
|
|
|
user = await db.get(User, user_id)
|
|
if not user:
|
|
logger.debug('Не удалось найти пользователя для автовыдачи промогруппы', user_id=user_id)
|
|
return None
|
|
|
|
# Получаем текущую primary промогруппу
|
|
old_group = user.get_primary_promo_group()
|
|
|
|
total_spent = await get_user_total_spent_kopeks(db, user_id)
|
|
if total_spent <= 0:
|
|
return None
|
|
|
|
previous_threshold = user.auto_promo_group_threshold_kopeks or 0
|
|
|
|
target_group = await _get_best_group_for_spending(
|
|
db,
|
|
total_spent,
|
|
min_threshold_kopeks=previous_threshold,
|
|
)
|
|
if not target_group:
|
|
return None
|
|
|
|
try:
|
|
target_threshold = target_group.auto_assign_total_spent_kopeks or 0
|
|
|
|
if target_threshold <= previous_threshold:
|
|
logger.debug(
|
|
"Порог промогруппы '' не превышает ранее назначенный для пользователя",
|
|
target_group_name=target_group.name,
|
|
target_threshold=target_threshold,
|
|
previous_threshold=previous_threshold,
|
|
telegram_id=user.telegram_id,
|
|
)
|
|
return None
|
|
|
|
# Проверяем, есть ли уже эта группа у пользователя
|
|
already_has_group = await has_user_promo_group(db, user_id, target_group.id)
|
|
|
|
if user.auto_promo_group_assigned and already_has_group:
|
|
logger.debug(
|
|
"Пользователь уже имеет промогруппу '', повторная выдача не требуется",
|
|
telegram_id=user.telegram_id,
|
|
target_group_name=target_group.name,
|
|
)
|
|
await sync_user_primary_promo_group(db, user_id)
|
|
if target_threshold > previous_threshold:
|
|
user.auto_promo_group_threshold_kopeks = target_threshold
|
|
user.updated_at = datetime.now(UTC)
|
|
await db.commit()
|
|
await db.refresh(user)
|
|
return target_group
|
|
|
|
user.auto_promo_group_assigned = True
|
|
user.auto_promo_group_threshold_kopeks = target_threshold
|
|
user.updated_at = datetime.now(UTC)
|
|
|
|
if not already_has_group:
|
|
# Добавляем новую промогруппу к существующим
|
|
await add_user_to_promo_group(db, user_id, target_group.id, assigned_by='auto')
|
|
logger.info(
|
|
"🤖 Пользователю добавлена промогруппа '' за траты ₽",
|
|
telegram_id=user.telegram_id,
|
|
target_group_name=target_group.name,
|
|
total_spent=total_spent / 100,
|
|
)
|
|
else:
|
|
logger.info(
|
|
"🤖 Пользователь уже имеет промогруппу '', отмечаем автоприсвоение",
|
|
telegram_id=user.telegram_id,
|
|
target_group_name=target_group.name,
|
|
)
|
|
|
|
await db.commit()
|
|
await db.refresh(user)
|
|
|
|
if not already_has_group:
|
|
await _notify_admins_about_auto_assignment(
|
|
db,
|
|
user,
|
|
old_group,
|
|
target_group,
|
|
total_spent,
|
|
)
|
|
|
|
return target_group
|
|
except Exception as exc:
|
|
logger.error('Ошибка при автоматическом назначении промогруппы пользователю', user_id=user_id, exc=exc)
|
|
await db.rollback()
|
|
return None
|