From e6e688a395e85f9a1a23d2e5bac1b44195011330 Mon Sep 17 00:00:00 2001 From: PEDZEO Date: Mon, 19 Jan 2026 01:30:31 +0300 Subject: [PATCH] fix(routes): reorder notification and ticket routers to prevent route conflicts - Moved the notifications router to be included before the tickets router to avoid conflicts. - Updated comments for clarity regarding the order of router inclusion. --- app/cabinet/routes/__init__.py | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/app/cabinet/routes/__init__.py b/app/cabinet/routes/__init__.py index 06369b33..bea7b005 100644 --- a/app/cabinet/routes/__init__.py +++ b/app/cabinet/routes/__init__.py @@ -44,8 +44,9 @@ router.include_router(auth_router) router.include_router(subscription_router) router.include_router(balance_router) router.include_router(referral_router) -router.include_router(tickets_router) +# Notifications router MUST be before tickets router to avoid route conflict router.include_router(ticket_notifications_router) +router.include_router(tickets_router) router.include_router(promocode_router) router.include_router(contests_router) router.include_router(polls_router) @@ -58,9 +59,9 @@ router.include_router(media_router) # Wheel routes router.include_router(wheel_router) -# Admin routes -router.include_router(admin_tickets_router) +# Admin routes (notifications router MUST be before tickets router to avoid route conflict) router.include_router(admin_ticket_notifications_router) +router.include_router(admin_tickets_router) router.include_router(admin_settings_router) router.include_router(admin_apps_router) router.include_router(admin_wheel_router) @@ -76,11 +77,6 @@ router.include_router(admin_users_router) router.include_router(admin_payments_router) router.include_router(admin_promo_offers_router) router.include_router(admin_remnawave_router) -router.include_router(ticket_notifications_router) -router.include_router(admin_ticket_notifications_router) - -# WebSocket route -router.include_router(websocket_router) # WebSocket route router.include_router(websocket_router)