Fringg
4a002b7db1
Remove the threshold barrier that prevented re-assignment to the same promo group tier. Previously, _get_best_group_for_spending was called with min_threshold_kopeks=previous_threshold, which meant once a user was auto-assigned to a tier (e.g. 100 kopeks), the check 100 > 100 would fail and the function would skip cleanup of promocode groups. Now the function always finds the best group for the user's spending without threshold filtering. The threshold ratchet is preserved only for the watermark update (auto_promo_group_threshold_kopeks only increases, never decreases). Also elevate promo group assignment failure logging from DEBUG to WARNING across all 3 call sites in transaction.py.
200 lines
7.5 KiB
Python
200 lines
7.5 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.crud.user import lock_user_for_update
|
|
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,
|
|
get_user_promo_groups,
|
|
has_user_promo_group,
|
|
remove_user_from_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
|
|
|
|
# Блокируем строку пользователя для предотвращения гонок при конкурентных вебхуках
|
|
user = await lock_user_for_update(db, user)
|
|
|
|
# Получаем текущую 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)
|
|
if not target_group:
|
|
return None
|
|
|
|
try:
|
|
target_threshold = target_group.auto_assign_total_spent_kopeks or 0
|
|
|
|
# Фаза 1: Удаляем старые auto/promocode группы, отличные от целевой
|
|
current_groups = await get_user_promo_groups(db, user_id)
|
|
removed_any = False
|
|
for upg in current_groups:
|
|
if upg.promo_group_id != target_group.id and upg.assigned_by in ('auto', 'promocode'):
|
|
await remove_user_from_promo_group(db, user_id, upg.promo_group_id, commit=False)
|
|
removed_any = True
|
|
logger.info(
|
|
'Удалена старая промогруппа перед автоназначением',
|
|
telegram_id=user.telegram_id,
|
|
old_group_name=upg.promo_group.name if upg.promo_group else upg.promo_group_id,
|
|
old_assigned_by=upg.assigned_by,
|
|
)
|
|
|
|
if removed_any:
|
|
await db.flush()
|
|
await db.refresh(user)
|
|
|
|
# Проверяем, есть ли уже целевая группа у пользователя
|
|
already_has_group = await has_user_promo_group(db, user_id, target_group.id)
|
|
|
|
if user.auto_promo_group_assigned and already_has_group and not removed_any:
|
|
logger.debug(
|
|
'Пользователь уже имеет промогруппу, повторная выдача не требуется',
|
|
telegram_id=user.telegram_id,
|
|
target_group_name=target_group.name,
|
|
)
|
|
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
|
|
if target_threshold > previous_threshold:
|
|
user.auto_promo_group_threshold_kopeks = target_threshold
|
|
user.updated_at = datetime.now(UTC)
|
|
|
|
newly_added = False
|
|
if not already_has_group:
|
|
await add_user_to_promo_group(db, user_id, target_group.id, assigned_by='auto', commit=False)
|
|
newly_added = True
|
|
logger.info(
|
|
'Пользователю назначена промогруппа за траты',
|
|
telegram_id=user.telegram_id,
|
|
target_group_name=target_group.name,
|
|
total_spent=total_spent / 100,
|
|
)
|
|
else:
|
|
await sync_user_primary_promo_group(db, user_id)
|
|
logger.info(
|
|
'Пользователь уже имеет промогруппу, синхронизировано',
|
|
telegram_id=user.telegram_id,
|
|
target_group_name=target_group.name,
|
|
)
|
|
|
|
await db.commit()
|
|
await db.refresh(user)
|
|
|
|
if newly_added:
|
|
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
|