Fixed close position

app/telegram/handlers/close_orders.py

@@ -1,12 +1,15 @@
 import logging.config
 
-from aiogram import F, Router
+from aiogram import Router
 from aiogram.fsm.context import FSMContext
 from aiogram.types import CallbackQuery
 
-from app.bybit.close_positions import cancel_all_orders, cancel_order, close_position
+from app.bybit.close_positions import cancel_order, close_position
+from app.helper_functions import safe_float
 from logger_helper.logger_helper import LOGGING_CONFIG
 
+import database.request as rq
+
 logging.config.dictConfig(LOGGING_CONFIG)
 logger = logging.getLogger("close_orders")
 
@@ -17,7 +20,7 @@ router_close_orders = Router(name="close_orders")
     lambda c: c.data and c.data.startswith("close_position_")
 )
 async def close_position_handler(
-    callback_query: CallbackQuery, state: FSMContext
+        callback_query: CallbackQuery, state: FSMContext
 ) -> None:
     """
     Close a position.
@@ -26,13 +29,23 @@ async def close_position_handler(
     :return: None
     """
     try:
-        symbol = callback_query.data.split("_", 2)[2]
-        res = await close_position(tg_id=callback_query.from_user.id, symbol=symbol)
+        data = callback_query.data
+        parts = data.split("_")
+        symbol = parts[2]
+        side = parts[3]
+        position_idx = int(parts[4])
+        qty = safe_float(parts[5])
+        res = await close_position(tg_id=callback_query.from_user.id,
+                                   symbol=symbol,
+                                   side=side,
+                                   position_idx=position_idx,
+                                   qty=qty)
 
         if not res:
             await callback_query.answer(text="Произошла ошибка при закрытии позиции.")
             return
 
+        await rq.set_auto_trading(tg_id=callback_query.from_user.id, symbol=symbol, auto_trading=False, side=side)
         await callback_query.answer(text="Позиция успешно закрыта.")
         logger.debug(
             "Command close_position processed successfully for user: %s",
@@ -53,7 +66,7 @@ async def close_position_handler(
     lambda c: c.data and c.data.startswith("close_order_")
 )
 async def cancel_order_handler(
-    callback_query: CallbackQuery, state: FSMContext
+        callback_query: CallbackQuery, state: FSMContext
 ) -> None:
     """
     Cancel an order.
@@ -62,8 +75,11 @@ async def cancel_order_handler(
     :return: None
     """
     try:
-        symbol = callback_query.data.split("_", 2)[2]
-        res = await cancel_order(tg_id=callback_query.from_user.id, symbol=symbol)
+        data = callback_query.data
+        parts = data.split("_")
+        symbol = parts[2]
+        order_id = parts[3]
+        res = await cancel_order(tg_id=callback_query.from_user.id, symbol=symbol, order_id=order_id)
 
         if not res:
             await callback_query.answer(text="Произошла ошибка при закрытии ордера.")
@@ -82,39 +98,4 @@ async def cancel_order_handler(
             e,
         )
     finally:
-        await state.clear()
-
-
-@router_close_orders.callback_query(F.data == "cancel_all_orders")
-async def cancel_all_orders_handler(
-    callback_query: CallbackQuery, state: FSMContext
-) -> None:
-    """
-    Close all open positions and orders.
-    :param callback_query: Incoming callback query from Telegram inline keyboard.
-    :param state: Finite State Machine context for the current user session.
-    :return: None
-    """
-    try:
-        res = await cancel_all_orders(tg_id=callback_query.from_user.id)
-
-        if not res:
-            await callback_query.answer(
-                text="Произошла ошибка при закрытии всех ордеров."
-            )
-            return
-
-        await callback_query.answer(text="Все ордера успешно закрыты.")
-        logger.debug(
-            "Command close_all_orders processed successfully for user: %s",
-            callback_query.from_user.id,
-        )
-    except Exception as e:
-        await callback_query.answer(text="Произошла ошибка при закрытии всех ордеров.")
-        logger.error(
-            "Error processing command close_all_orders for user %s: %s",
-            callback_query.from_user.id,
-            e,
-        )
-    finally:
-        await state.clear()
+        await state.clear()