diff --git a/.github/workflows/docker-hub.yml b/.github/workflows/docker-hub.yml index 81fd268a..867a22e6 100644 --- a/.github/workflows/docker-hub.yml +++ b/.github/workflows/docker-hub.yml @@ -36,15 +36,15 @@ jobs: TAGS="fr1ngg/remnawave-bedolaga-telegram-bot:latest,fr1ngg/remnawave-bedolaga-telegram-bot:${VERSION}" echo "🏷️ Собираем релизную версию: $VERSION" elif [[ $GITHUB_REF == refs/heads/main ]]; then - VERSION="v2.5.5-$(git rev-parse --short HEAD)" + VERSION="v2.5.6-$(git rev-parse --short HEAD)" TAGS="fr1ngg/remnawave-bedolaga-telegram-bot:latest,fr1ngg/remnawave-bedolaga-telegram-bot:${VERSION}" echo "🚀 Собираем версию из main: $VERSION" elif [[ $GITHUB_REF == refs/heads/dev ]]; then - VERSION="v2.5.5-dev-$(git rev-parse --short HEAD)" + VERSION="v2.5.6-dev-$(git rev-parse --short HEAD)" TAGS="fr1ngg/remnawave-bedolaga-telegram-bot:dev,fr1ngg/remnawave-bedolaga-telegram-bot:${VERSION}" echo "🧪 Собираем dev версию: $VERSION" else - VERSION="v2.5.5-pr-$(git rev-parse --short HEAD)" + VERSION="v2.5.6-pr-$(git rev-parse --short HEAD)" TAGS="fr1ngg/remnawave-bedolaga-telegram-bot:pr-$(git rev-parse --short HEAD)" echo "🔀 Собираем PR версию: $VERSION" fi diff --git a/.github/workflows/docker-registry.yml b/.github/workflows/docker-registry.yml index 1f11f64a..d6fa1ee6 100644 --- a/.github/workflows/docker-registry.yml +++ b/.github/workflows/docker-registry.yml @@ -49,13 +49,13 @@ jobs: VERSION=${GITHUB_REF#refs/tags/} echo "🏷️ Building release version: $VERSION" elif [[ $GITHUB_REF == refs/heads/main ]]; then - VERSION="v2.5.5-$(git rev-parse --short HEAD)" + VERSION="v2.5.6-$(git rev-parse --short HEAD)" echo "🚀 Building main version: $VERSION" elif [[ $GITHUB_REF == refs/heads/dev ]]; then - VERSION="v2.5.5-dev-$(git rev-parse --short HEAD)" + VERSION="v2.5.6-dev-$(git rev-parse --short HEAD)" echo "🧪 Building dev version: $VERSION" else - VERSION="v2.5.5-pr-$(git rev-parse --short HEAD)" + VERSION="v2.5.6-pr-$(git rev-parse --short HEAD)" echo "🔀 Building PR version: $VERSION" fi echo "version=$VERSION" >> $GITHUB_OUTPUT diff --git a/Dockerfile b/Dockerfile index af0b3d93..c190636c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,7 +14,7 @@ RUN pip install --no-cache-dir --upgrade pip && \ FROM python:3.13-slim -ARG VERSION="v2.5.5" +ARG VERSION="v2.5.6" ARG BUILD_DATE ARG VCS_REF diff --git a/app/services/payment/yookassa.py b/app/services/payment/yookassa.py index 1c675ed4..ca3d0574 100644 --- a/app/services/payment/yookassa.py +++ b/app/services/payment/yookassa.py @@ -319,6 +319,7 @@ class YooKassaPaymentMixin: ) -> bool: """Переносит успешный платёж YooKassa в транзакции и начисляет баланс пользователю.""" try: + from sqlalchemy import select payment_module = import_module("app.services.payment_service") payment_description = getattr(payment, "description", "YooKassa платеж") @@ -387,9 +388,24 @@ class YooKassaPaymentMixin: user.balance_kopeks += payment.amount_kopeks user.updated_at = datetime.utcnow() - promo_group = getattr(user, "promo_group", None) - subscription = getattr(user, "subscription", None) - referrer_info = format_referrer_info(user) + # Обновляем пользователя с нужными связями, чтобы избежать проблем с ленивой загрузкой + from app.database.crud.user import get_user_by_id + from sqlalchemy.orm import selectinload + from app.database.models import User, Subscription as SubscriptionModel + + # Загружаем пользователя с подпиской и промо-группой + full_user_result = await db.execute( + select(User) + .options(selectinload(User.subscription)) + .options(selectinload(User.promo_group)) + .where(User.id == user.id) + ) + full_user = full_user_result.scalar_one_or_none() + + # Используем обновленные данные или исходные, если не удалось обновить + subscription = full_user.subscription if full_user else getattr(user, "subscription", None) + promo_group = full_user.promo_group if full_user else getattr(user, "promo_group", None) + referrer_info = format_referrer_info(full_user if full_user else user) topup_status = ( "🆕 Первое пополнение" if was_first_topup else "🔄 Пополнение" ) @@ -425,8 +441,13 @@ class YooKassaPaymentMixin: ) notification_service = AdminNotificationService(self.bot) + + # Обновляем пользователя, чтобы избежать проблем с ленивой загрузкой + from app.database.crud.user import get_user_by_id + refreshed_user = await get_user_by_id(db, user.id) + await notification_service.send_balance_topup_notification( - user, + refreshed_user or user, transaction, old_balance, topup_status=topup_status, @@ -619,10 +640,32 @@ class YooKassaPaymentMixin: ) notification_service = AdminNotificationService(self.bot) + + # Обновляем пользователя с нужными связями, чтобы избежать проблем с ленивой загрузкой + from sqlalchemy import select + from sqlalchemy.orm import selectinload + from app.database.models import User, Subscription as SubscriptionModel + + # Загружаем пользователя с подпиской и промо-группой + full_user_result = await db.execute( + select(User) + .options(selectinload(User.subscription)) + .options(selectinload(User.promo_group)) + .where(User.id == user.id) + ) + full_user = full_user_result.scalar_one_or_none() + + # Загружаем подписку отдельно, если нужно + subscription_result = await db.execute( + select(SubscriptionModel) + .where(SubscriptionModel.user_id == user.id) + ) + subscription_db = subscription_result.scalar_one_or_none() + await notification_service.send_subscription_purchase_notification( db, - user, - subscription, + full_user or user, + subscription_db or subscription, transaction, subscription_period, was_trial_conversion=False,