Fixed

app/telegram/database/requests.py

@@ -239,17 +239,21 @@ async def update_symbol(tg_id: int, symbol: str) -> None:
         await session.commit()
 
 
-async def update_api_key(tg_id: int, api: str) -> None:
+async def upsert_api_keys(tg_id: int, api_key: str, secret_key: str) -> None:
     """Обновить API ключ пользователя."""
     async with async_session() as session:
-        await session.execute(update(UBA).where(UBA.tg_id == tg_id).values(api_key=api))
-        await session.commit()
-
-
-async def update_secret_key(tg_id: int, api: str) -> None:
-    """Обновить секретный ключ пользователя."""
-    async with async_session() as session:
-        await session.execute(update(UBA).where(UBA.tg_id == tg_id).values(secret_key=api))
+        result = await session.execute(select(UBA).where(UBA.tg_id == tg_id))
+        user = result.scalars().first()
+        if user:
+            if api_key is not None:
+                user.api_key = api_key
+            if secret_key is not None:
+                user.secret_key = secret_key
+            logger.info(f"Обновлены ключи для пользователя {tg_id}")
+        else:
+            new_user = UBA(tg_id=tg_id, api_key=api_key, secret_key=secret_key)
+            session.add(new_user)
+            logger.info(f"Добавлен новый пользователь {tg_id} с ключами")
         await session.commit()
 
 
@@ -303,36 +307,20 @@ async def get_user_main_settings(tg_id):
     """Получить основные настройки пользователя."""
     async with async_session() as session:
         user = await session.scalar(select(UMS).where(UMS.tg_id == tg_id))
-
         if user:
-            logger.info("Получение основных настроек пользователя %s", tg_id)
-
-            trading_mode = await session.scalar(select(UMS.trading_mode).where(UMS.tg_id == tg_id))
-            margin_mode = await session.scalar(select(UMS.margin_type).where(UMS.tg_id == tg_id))
-            switch_mode_enabled = await session.scalar(select(UMS.switch_mode_enabled).where(UMS.tg_id == tg_id))
-            switch_state = await session.scalar(select(UMS.switch_state).where(UMS.tg_id == tg_id))
-            size_leverage = await session.scalar(select(UMS.size_leverage).where(UMS.tg_id == tg_id))
-            starting_quantity = await session.scalar(select(UMS.starting_quantity).where(UMS.tg_id == tg_id))
-            martingale_factor = await session.scalar(select(UMS.martingale_factor).where(UMS.tg_id == tg_id))
-            maximal_quantity = await session.scalar(select(UMS.maximal_quantity).where(UMS.tg_id == tg_id))
-            entry_order_type = await session.scalar(select(UMS.entry_order_type).where(UMS.tg_id == tg_id))
-            limit_order_price = await session.scalar(select(UMS.limit_order_price).where(UMS.tg_id == tg_id))
-            martingale_step = await session.scalar(select(UMS.martingale_step).where(UMS.tg_id == tg_id))
-
             data = {
-                'trading_mode': trading_mode,
-                'margin_type': margin_mode,
-                'switch_mode_enabled': switch_mode_enabled,
-                'switch_state': switch_state,
-                'size_leverage': size_leverage,
-                'starting_quantity': starting_quantity,
-                'martingale_factor': martingale_factor,
-                'maximal_quantity': maximal_quantity,
-                'entry_order_type': entry_order_type,
-                'limit_order_price': limit_order_price,
-                'martingale_step': martingale_step,
+                'trading_mode': user.trading_mode,
+                'margin_type': user.margin_type,
+                'switch_state': user.switch_state,
+                'size_leverage': user.size_leverage,
+                'starting_quantity': user.starting_quantity,
+                'martingale_factor': user.martingale_factor,
+                'maximal_quantity': user.maximal_quantity,
+                'entry_order_type': user.entry_order_type,
+                'limit_order_price': user.limit_order_price,
+                'martingale_step': user.martingale_step,
+                'last_side': user.last_side,
             }
-
             return data
 
 
@@ -575,4 +563,23 @@ async def update_trigger(tg_id, trigger):
     async with async_session() as session:
         await session.execute(update(UCS).where(UCS.tg_id == tg_id).values(trigger=trigger))
 
+        await session.commit()
+
+
+async def set_last_series_info(tg_id: int, last_side: str):
+    async with async_session() as session:
+        async with session.begin():
+            # Обновляем запись
+            result = await session.execute(
+                update(UMS)
+                .where(UMS.tg_id == tg_id)
+                .values(last_side=last_side)
+            )
+            if result.rowcount == 0:
+                # Если запись не существует, создаём новую
+                new_entry = UMS(
+                    tg_id=tg_id,
+                    last_side=last_side,
+                )
+                session.add(new_entry)
         await session.commit()