From 4c2e11e64bed41592f5a12061dcca74ce43e0806 Mon Sep 17 00:00:00 2001
From: Fringg <egor.andrianovv@gmail.com>
Date: Fri, 6 Feb 2026 16:27:38 +0300
Subject: [PATCH] feat: add tariff reorder API endpoint

Add PUT /cabinet/admin/tariffs/order endpoint for drag-and-drop
tariff sorting in admin cabinet. Move db.commit() from CRUD to
route level for consistency.
---
 app/cabinet/routes/admin_tariffs.py | 17 +++++++++++++++++
 app/cabinet/schemas/tariffs.py      |  6 ++++++
 app/database/crud/tariff.py         |  2 --
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/app/cabinet/routes/admin_tariffs.py b/app/cabinet/routes/admin_tariffs.py
index da7c1e3f..f2accb18 100644
--- a/app/cabinet/routes/admin_tariffs.py
+++ b/app/cabinet/routes/admin_tariffs.py
@@ -14,6 +14,7 @@ from app.database.crud.tariff import (
     get_tariff_by_id,
     get_tariff_subscriptions_count,
     load_period_prices_from_db,
+    reorder_tariffs,
     set_tariff_promo_groups,
     update_tariff,
 )
@@ -29,6 +30,7 @@ from ..schemas.tariffs import (
     TariffDetailResponse,
     TariffListItem,
     TariffListResponse,
+    TariffSortOrderRequest,
     TariffStatsResponse,
     TariffToggleResponse,
     TariffTrialResponse,
@@ -157,6 +159,21 @@ async def get_available_servers(
     ]
 
 
+@router.put('/order')
+async def update_tariff_order(
+    request: TariffSortOrderRequest,
+    admin: User = Depends(get_current_admin_user),
+    db: AsyncSession = Depends(get_cabinet_db),
+):
+    """Update the display order of tariffs."""
+    await reorder_tariffs(db, request.tariff_ids)
+    await db.commit()
+
+    logger.info(f'Admin {admin.id} updated tariff order: {request.tariff_ids}')
+
+    return {'message': 'Tariff order updated successfully'}
+
+
 @router.get('/{tariff_id}', response_model=TariffDetailResponse)
 async def get_tariff(
     tariff_id: int,
diff --git a/app/cabinet/schemas/tariffs.py b/app/cabinet/schemas/tariffs.py
index ac850827..3ca7e9bf 100644
--- a/app/cabinet/schemas/tariffs.py
+++ b/app/cabinet/schemas/tariffs.py
@@ -194,6 +194,12 @@ class TariffUpdateRequest(BaseModel):
     traffic_reset_mode: str | None = None  # DAY, WEEK, MONTH, NO_RESET, None = глобальная настройка
 
 
+class TariffSortOrderRequest(BaseModel):
+    """Request to reorder tariffs."""
+
+    tariff_ids: list[int] = Field(..., min_length=1, description='Ordered list of tariff IDs')
+
+
 class TariffToggleResponse(BaseModel):
     """Response after toggling tariff."""
 
diff --git a/app/database/crud/tariff.py b/app/database/crud/tariff.py
index 3bd00169..d8cba1e7 100644
--- a/app/database/crud/tariff.py
+++ b/app/database/crud/tariff.py
@@ -486,8 +486,6 @@ async def reorder_tariffs(
     for order, tariff_id in enumerate(tariff_order):
         await db.execute(update(Tariff).where(Tariff.id == tariff_id).values(display_order=order))
 
-    await db.commit()
-
     logger.info('Изменен порядок тарифов: %s', tariff_order)