WEB-APP/ Optimization/ Build fix/ Hotkey edit mode/ Log rotation/ Form a11y/ E2E non-blocking
This commit is contained in:
Vladless
+94
-75
@@ -1,50 +1,62 @@
|
||||
from sqlalchemy import and_, desc, func, insert, select, text, update
|
||||
from sqlalchemy.exc import SQLAlchemyError
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
|
||||
from config import CHECK_REFERRAL_REWARD_ISSUED, REFERRAL_BONUS_PERCENTAGES
|
||||
from core.bootstrap import BUTTONS_CONFIG
|
||||
from database.access.resolution import resolve_user_optional
|
||||
from database.models import Referral
|
||||
from logger import logger
|
||||
|
||||
|
||||
async def add_referral(session: AsyncSession, referred_tg_id: int, referrer_tg_id: int):
|
||||
try:
|
||||
if referred_tg_id == referrer_tg_id:
|
||||
logger.warning(f"⚠️ Попытка самореферала: {referred_tg_id}")
|
||||
return
|
||||
async def add_referral(session: AsyncSession, referred_legacy: int, referrer_legacy: int):
|
||||
ru = await resolve_user_optional(session, referred_legacy)
|
||||
rf = await resolve_user_optional(session, referrer_legacy)
|
||||
if ru is None or rf is None:
|
||||
return
|
||||
if ru.id == rf.id:
|
||||
logger.warning(f"⚠️ Попытка самореферала: {referred_legacy}")
|
||||
return
|
||||
|
||||
stmt = insert(Referral).values(referred_tg_id=referred_tg_id, referrer_tg_id=referrer_tg_id)
|
||||
await session.execute(stmt)
|
||||
await session.commit()
|
||||
logger.info(f"✅ Добавлена реферальная связь: {referred_tg_id} → {referrer_tg_id}")
|
||||
except SQLAlchemyError as e:
|
||||
logger.error(f"❌ Ошибка при добавлении реферала: {e}")
|
||||
await session.rollback()
|
||||
raise
|
||||
stmt = insert(Referral).values(
|
||||
referred_user_id=ru.id,
|
||||
referrer_user_id=rf.id,
|
||||
referred_tg_id=ru.tg_id,
|
||||
referrer_tg_id=rf.tg_id,
|
||||
)
|
||||
await session.execute(stmt)
|
||||
logger.info(f"✅ Добавлена реферальная связь: {ru.id} → {rf.id}")
|
||||
|
||||
|
||||
async def get_referral_by_referred_id(session: AsyncSession, referred_tg_id: int) -> dict | None:
|
||||
stmt = select(Referral).where(Referral.referred_tg_id == referred_tg_id)
|
||||
async def get_referral_by_referred_id(session: AsyncSession, referred_legacy: int) -> dict | None:
|
||||
ru = await resolve_user_optional(session, referred_legacy)
|
||||
if ru is None:
|
||||
return None
|
||||
stmt = select(Referral).where(Referral.referred_user_id == ru.id)
|
||||
result = await session.execute(stmt)
|
||||
row = result.scalar_one_or_none()
|
||||
return dict(row.__dict__) if row else None
|
||||
|
||||
|
||||
async def get_total_referrals(session: AsyncSession, referrer_tg_id: int) -> int:
|
||||
stmt = select(func.count()).select_from(Referral).where(Referral.referrer_tg_id == referrer_tg_id)
|
||||
async def get_total_referrals(session: AsyncSession, referrer_legacy: int) -> int:
|
||||
ru = await resolve_user_optional(session, referrer_legacy)
|
||||
if ru is None:
|
||||
return 0
|
||||
stmt = select(func.count()).select_from(Referral).where(Referral.referrer_user_id == ru.id)
|
||||
result = await session.execute(stmt)
|
||||
return result.scalar()
|
||||
|
||||
|
||||
async def get_active_referrals(session: AsyncSession, referrer_tg_id: int) -> int:
|
||||
async def get_active_referrals(session: AsyncSession, referrer_legacy: int) -> int:
|
||||
ru = await resolve_user_optional(session, referrer_legacy)
|
||||
if ru is None:
|
||||
return 0
|
||||
stmt = (
|
||||
select(func.count())
|
||||
.select_from(Referral)
|
||||
.where(
|
||||
and_(
|
||||
Referral.referrer_tg_id == referrer_tg_id,
|
||||
Referral.reward_issued is True,
|
||||
Referral.referrer_user_id == ru.id,
|
||||
Referral.reward_issued.is_(True),
|
||||
)
|
||||
)
|
||||
)
|
||||
@@ -52,44 +64,51 @@ async def get_active_referrals(session: AsyncSession, referrer_tg_id: int) -> in
|
||||
return result.scalar()
|
||||
|
||||
|
||||
async def mark_referral_reward_issued(session: AsyncSession, referred_tg_id: int):
|
||||
await session.execute(update(Referral).where(Referral.referred_tg_id == referred_tg_id).values(reward_issued=True))
|
||||
await session.commit()
|
||||
async def mark_referral_reward_issued(session: AsyncSession, referred_legacy: int):
|
||||
ru = await resolve_user_optional(session, referred_legacy)
|
||||
if ru is None:
|
||||
return
|
||||
await session.execute(update(Referral).where(Referral.referred_user_id == ru.id).values(reward_issued=True))
|
||||
|
||||
|
||||
async def get_total_referral_bonus(session: AsyncSession, referrer_tg_id: int, max_levels: int) -> float:
|
||||
async def get_total_referral_bonus(session: AsyncSession, referrer_legacy: int, max_levels: int) -> float:
|
||||
referral_enabled = bool(BUTTONS_CONFIG.get("REFERRAL_BUTTON_ENABLED", True))
|
||||
if not referral_enabled:
|
||||
logger.debug("Реферальная программа отключена, бонусы не начисляются")
|
||||
return 0.0
|
||||
|
||||
ru = await resolve_user_optional(session, referrer_legacy)
|
||||
if ru is None:
|
||||
return 0.0
|
||||
uid = ru.id
|
||||
|
||||
if CHECK_REFERRAL_REWARD_ISSUED:
|
||||
bonus_cte = """
|
||||
WITH RECURSIVE
|
||||
referral_levels AS (
|
||||
SELECT
|
||||
referred_tg_id,
|
||||
referrer_tg_id,
|
||||
referred_user_id,
|
||||
referrer_user_id,
|
||||
1 AS level
|
||||
FROM referrals
|
||||
WHERE referrer_tg_id = :tg_id AND reward_issued = TRUE
|
||||
WHERE referrer_user_id = :user_id AND reward_issued = TRUE
|
||||
|
||||
UNION
|
||||
|
||||
SELECT
|
||||
r.referred_tg_id,
|
||||
r.referrer_tg_id,
|
||||
r.referred_user_id,
|
||||
r.referrer_user_id,
|
||||
rl.level + 1
|
||||
FROM referrals r
|
||||
JOIN referral_levels rl ON r.referrer_tg_id = rl.referred_tg_id
|
||||
JOIN referral_levels rl ON r.referrer_user_id = rl.referred_user_id
|
||||
WHERE rl.level < :max_levels AND r.reward_issued = TRUE
|
||||
),
|
||||
earliest_payments AS (
|
||||
SELECT DISTINCT ON (tg_id) tg_id, amount, created_at
|
||||
SELECT DISTINCT ON (user_id) user_id, amount, created_at
|
||||
FROM payments
|
||||
WHERE status = 'success'
|
||||
AND payment_system NOT IN ('coupon', 'admin', 'referral')
|
||||
ORDER BY tg_id, created_at
|
||||
ORDER BY user_id, created_at
|
||||
)
|
||||
"""
|
||||
bonus_query = (
|
||||
@@ -110,7 +129,7 @@ async def get_total_referral_bonus(session: AsyncSession, referrer_tg_id: int, m
|
||||
END
|
||||
), 0) AS total_bonus
|
||||
FROM referral_levels rl
|
||||
JOIN earliest_payments ep ON rl.referred_tg_id = ep.tg_id
|
||||
JOIN earliest_payments ep ON rl.referred_user_id = ep.user_id
|
||||
WHERE rl.level <= :max_levels
|
||||
"""
|
||||
)
|
||||
@@ -119,20 +138,20 @@ async def get_total_referral_bonus(session: AsyncSession, referrer_tg_id: int, m
|
||||
WITH RECURSIVE
|
||||
referral_levels AS (
|
||||
SELECT
|
||||
referred_tg_id,
|
||||
referrer_tg_id,
|
||||
referred_user_id,
|
||||
referrer_user_id,
|
||||
1 AS level
|
||||
FROM referrals
|
||||
WHERE referrer_tg_id = :tg_id
|
||||
WHERE referrer_user_id = :user_id
|
||||
|
||||
UNION
|
||||
|
||||
SELECT
|
||||
r.referred_tg_id,
|
||||
r.referrer_tg_id,
|
||||
r.referred_user_id,
|
||||
r.referrer_user_id,
|
||||
rl.level + 1
|
||||
FROM referrals r
|
||||
JOIN referral_levels rl ON r.referrer_tg_id = rl.referred_tg_id
|
||||
JOIN referral_levels rl ON r.referrer_user_id = rl.referred_user_id
|
||||
WHERE rl.level < :max_levels
|
||||
)
|
||||
"""
|
||||
@@ -154,7 +173,7 @@ async def get_total_referral_bonus(session: AsyncSession, referrer_tg_id: int, m
|
||||
END
|
||||
), 0) AS total_bonus
|
||||
FROM referral_levels rl
|
||||
JOIN payments p ON rl.referred_tg_id = p.tg_id
|
||||
JOIN payments p ON rl.referred_user_id = p.user_id
|
||||
WHERE p.status = 'success'
|
||||
AND p.payment_system NOT IN ('coupon', 'admin', 'referral')
|
||||
AND rl.level <= :max_levels
|
||||
@@ -163,7 +182,7 @@ async def get_total_referral_bonus(session: AsyncSession, referrer_tg_id: int, m
|
||||
|
||||
result = await session.execute(
|
||||
text(bonus_query),
|
||||
{"tg_id": referrer_tg_id, "max_levels": max_levels},
|
||||
{"user_id": uid, "max_levels": max_levels},
|
||||
)
|
||||
total_bonus_raw = result.scalar()
|
||||
total_bonus = round(float(total_bonus_raw or 0), 2)
|
||||
@@ -172,29 +191,32 @@ async def get_total_referral_bonus(session: AsyncSession, referrer_tg_id: int, m
|
||||
return total_bonus
|
||||
|
||||
|
||||
async def get_referrals_by_level(session: AsyncSession, referrer_tg_id: int, max_levels: int) -> dict:
|
||||
async def get_referrals_by_level(session: AsyncSession, referrer_legacy: int, max_levels: int) -> dict:
|
||||
ru = await resolve_user_optional(session, referrer_legacy)
|
||||
if ru is None:
|
||||
return {}
|
||||
query = """
|
||||
WITH RECURSIVE referral_levels AS (
|
||||
SELECT referred_tg_id, referrer_tg_id, 1 AS level
|
||||
SELECT referred_user_id, referrer_user_id, 1 AS level
|
||||
FROM referrals
|
||||
WHERE referrer_tg_id = :referrer_tg_id
|
||||
WHERE referrer_user_id = :referrer_user_id
|
||||
UNION
|
||||
SELECT r.referred_tg_id, r.referrer_tg_id, rl.level + 1
|
||||
SELECT r.referred_user_id, r.referrer_user_id, rl.level + 1
|
||||
FROM referrals r
|
||||
JOIN referral_levels rl ON r.referrer_tg_id = rl.referred_tg_id
|
||||
JOIN referral_levels rl ON r.referrer_user_id = rl.referred_user_id
|
||||
WHERE rl.level < :max_levels
|
||||
)
|
||||
SELECT level,
|
||||
COUNT(*) AS level_count,
|
||||
COUNT(CASE WHEN reward_issued THEN 1 END) AS active_level_count
|
||||
FROM referral_levels rl
|
||||
JOIN referrals r ON rl.referred_tg_id = r.referred_tg_id
|
||||
JOIN referrals r ON rl.referred_user_id = r.referred_user_id
|
||||
GROUP BY level
|
||||
ORDER BY level
|
||||
"""
|
||||
result = await session.execute(
|
||||
text(query),
|
||||
{"referrer_tg_id": referrer_tg_id, "max_levels": max_levels},
|
||||
{"referrer_user_id": ru.id, "max_levels": max_levels},
|
||||
)
|
||||
return {
|
||||
row["level"]: {
|
||||
@@ -205,38 +227,35 @@ async def get_referrals_by_level(session: AsyncSession, referrer_tg_id: int, max
|
||||
}
|
||||
|
||||
|
||||
async def get_referral_stats(session: AsyncSession, referrer_tg_id: int):
|
||||
try:
|
||||
logger.info(f"[ReferralStats] Получение статистики для пользователя {referrer_tg_id}")
|
||||
async def get_referral_stats(session: AsyncSession, referrer_legacy: int):
|
||||
logger.info(f"[ReferralStats] Получение статистики для пользователя {referrer_legacy}")
|
||||
|
||||
total_referrals = await get_total_referrals(session, referrer_tg_id)
|
||||
active_referrals = await get_active_referrals(session, referrer_tg_id)
|
||||
max_levels = len(REFERRAL_BONUS_PERCENTAGES)
|
||||
referrals_by_level = await get_referrals_by_level(session, referrer_tg_id, max_levels)
|
||||
total_referral_bonus = await get_total_referral_bonus(session, referrer_tg_id, max_levels)
|
||||
total_referrals = await get_total_referrals(session, referrer_legacy)
|
||||
active_referrals = await get_active_referrals(session, referrer_legacy)
|
||||
max_levels = len(REFERRAL_BONUS_PERCENTAGES)
|
||||
referrals_by_level = await get_referrals_by_level(session, referrer_legacy, max_levels)
|
||||
total_referral_bonus = await get_total_referral_bonus(session, referrer_legacy, max_levels)
|
||||
|
||||
return {
|
||||
"total_referrals": total_referrals,
|
||||
"active_referrals": active_referrals,
|
||||
"referrals_by_level": referrals_by_level,
|
||||
"total_referral_bonus": total_referral_bonus,
|
||||
}
|
||||
|
||||
except Exception as e:
|
||||
logger.error(f"[ReferralStats] Ошибка при получении статистики для пользователя {referrer_tg_id}: {e}")
|
||||
await session.rollback()
|
||||
raise
|
||||
return {
|
||||
"total_referrals": total_referrals,
|
||||
"active_referrals": active_referrals,
|
||||
"referrals_by_level": referrals_by_level,
|
||||
"total_referral_bonus": total_referral_bonus,
|
||||
}
|
||||
|
||||
|
||||
async def get_user_referral_count(session: AsyncSession, tg_id: int) -> int:
|
||||
result = await session.execute(select(func.count()).select_from(Referral).where(Referral.referrer_tg_id == tg_id))
|
||||
async def get_user_referral_count(session: AsyncSession, legacy: int) -> int:
|
||||
ru = await resolve_user_optional(session, legacy)
|
||||
if ru is None:
|
||||
return 0
|
||||
result = await session.execute(select(func.count()).select_from(Referral).where(Referral.referrer_user_id == ru.id))
|
||||
return result.scalar_one() or 0
|
||||
|
||||
|
||||
async def get_referral_position(session: AsyncSession, referral_count: int) -> int:
|
||||
subq = (
|
||||
select(Referral.referrer_tg_id)
|
||||
.group_by(Referral.referrer_tg_id)
|
||||
select(Referral.referrer_user_id)
|
||||
.group_by(Referral.referrer_user_id)
|
||||
.having(func.count() > referral_count)
|
||||
.subquery()
|
||||
)
|
||||
@@ -248,10 +267,10 @@ async def get_referral_position(session: AsyncSession, referral_count: int) -> i
|
||||
|
||||
async def get_top_referrals(session: AsyncSession, limit: int = 5):
|
||||
query = (
|
||||
select(Referral.referrer_tg_id, func.count().label("referral_count"))
|
||||
.group_by(Referral.referrer_tg_id)
|
||||
select(Referral.referrer_user_id, func.count().label("referral_count"))
|
||||
.group_by(Referral.referrer_user_id)
|
||||
.order_by(desc("referral_count"))
|
||||
.limit(limit)
|
||||
)
|
||||
result = await session.execute(query)
|
||||
return [{"referrer_tg_id": row.referrer_tg_id, "referral_count": row.referral_count} for row in result.all()]
|
||||
return [{"referrer_user_id": row.referrer_user_id, "referral_count": row.referral_count} for row in result.all()]
|
||||
|
||||
Reference in New Issue
Block a user