Merge pull request #20 from machka-pasla/codex/fix-payment-error-with-tribute

Fix Tribute duplicate payment error

bot/services/tribute_service.py

@@ -70,19 +70,29 @@ class TributeService:
 
         async with async_session_factory() as session:
             if event_name == 'new_subscription':
-                payment_record = await payment_dal.create_payment_record(
-                    session,
-                    {
-                        'user_id': user_id,
-                        'amount': float(price_rub),
-                        'currency': 'RUB',
-                        'status': 'succeeded',
-                        'description': 'Tribute subscription',
-                        'subscription_duration_months': months,
-                        'provider_payment_id': str(data.get('subscription_id')),
-                        'provider': 'tribute',
-                    },
-                )
+                provider_payment_id = str(data.get('subscription_id'))
+                existing_payment = await payment_dal.get_payment_by_provider_payment_id(
+                    session, provider_payment_id)
+                if existing_payment:
+                    logging.info(
+                        "Duplicate Tribute payment webhook ignored for provider_payment_id %s",
+                        provider_payment_id,
+                    )
+                    payment_record = existing_payment
+                else:
+                    payment_record = await payment_dal.create_payment_record(
+                        session,
+                        {
+                            'user_id': user_id,
+                            'amount': float(price_rub),
+                            'currency': 'RUB',
+                            'status': 'succeeded',
+                            'description': 'Tribute subscription',
+                            'subscription_duration_months': months,
+                            'provider_payment_id': provider_payment_id,
+                            'provider': 'tribute',
+                        },
+                    )
                 activation_details = await subscription_service.activate_subscription(
                     session,
                     user_id,

db/dal/payment_dal.py

@@ -46,6 +46,15 @@ async def get_payment_by_yookassa_id(
     return result.scalar_one_or_none()
 
 
+async def get_payment_by_provider_payment_id(
+        session: AsyncSession, provider_payment_id: str) -> Optional[Payment]:
+    """Fetch a payment by provider-specific identifier."""
+    stmt = select(Payment).where(
+        Payment.provider_payment_id == provider_payment_id)
+    result = await session.execute(stmt)
+    return result.scalar_one_or_none()
+
+
 async def get_payment_by_db_id(session: AsyncSession,
                                payment_db_id: int) -> Optional[Payment]: