The logic of the trading cycle has been changed #30

Merged
Arsen Mirzaev Tatyano-Muradovich merged 2 commits from Alex/stcs:devel into stable 2025-11-09 15:35:46 +07:00
2 changed files with 54 additions and 14 deletions
Showing only changes of commit 39bbe8d997 - Show all commits

View File

@@ -37,7 +37,7 @@ async def user_profile_bybit(tg_id: int, message: Message, state: FSMContext) ->
)
else:
await message.answer(
text="Ошибка при подключении, повторите попытку",
text="Ошибка при подключении к платформе. Проверьте ключи и повторите попытку.",
reply_markup=kbi.connect_the_platform,
)
logger.error("Error processing user profile for user %s", tg_id)

View File

@@ -85,6 +85,18 @@ async def cmd_to_main(message: Message, state: FSMContext) -> None:
None: Exceptions are caught and logged internally.
"""
try:
await state.clear()
user = await rq.get_user(tg_id=message.from_user.id)
if user:
await user_profile_tg(tg_id=message.from_user.id, message=message)
else:
await rq.create_user(
tg_id=message.from_user.id, username=message.from_user.username
)
await rq.set_user_symbol(tg_id=message.from_user.id, symbol="BTCUSDT")
await rq.create_user_additional_settings(tg_id=message.from_user.id)
await rq.create_user_risk_management(tg_id=message.from_user.id)
await rq.create_user_conditional_settings(tg_id=message.from_user.id)
await user_profile_tg(tg_id=message.from_user.id, message=message)
logger.debug(
"Command to_profile_tg processed successfully for user: %s",
@@ -117,9 +129,21 @@ async def profile_bybit(message: Message, state: FSMContext) -> None:
"""
try:
await state.clear()
user = await rq.get_user(tg_id=message.from_user.id)
if user:
await user_profile_bybit(
tg_id=message.from_user.id, message=message, state=state
)
else:
await rq.create_user(
tg_id=message.from_user.id, username=message.from_user.username
)
await rq.set_user_symbol(tg_id=message.from_user.id, symbol="BTCUSDT")
await rq.create_user_additional_settings(tg_id=message.from_user.id)
await rq.create_user_risk_management(tg_id=message.from_user.id)
await rq.create_user_conditional_settings(tg_id=message.from_user.id)
await user_profile_bybit(
tg_id=message.from_user.id, message=message, state=state)
logger.debug(
"Command to_profile_bybit processed successfully for user: %s",
message.from_user.id,
@@ -150,6 +174,9 @@ async def profile_bybit_callback(
"""
try:
await state.clear()
user = await rq.get_user(tg_id=callback_query.from_user.id)
if user:
await user_profile_bybit(
tg_id=callback_query.from_user.id,
message=callback_query.message,
@@ -159,6 +186,19 @@ async def profile_bybit_callback(
"Callback profile_bybit processed successfully for user: %s",
callback_query.from_user.id,
)
else:
await rq.create_user(
tg_id=callback_query.from_user.id, username=callback_query.from_user.username
)
await rq.set_user_symbol(tg_id=callback_query.from_user.id, symbol="BTCUSDT")
await rq.create_user_additional_settings(tg_id=callback_query.from_user.id)
await rq.create_user_risk_management(tg_id=callback_query.from_user.id)
await rq.create_user_conditional_settings(tg_id=callback_query.from_user.id)
await user_profile_bybit(
tg_id=callback_query.from_user.id,
message=callback_query.message,
state=state,
)
await callback_query.answer()
except Exception as e:
logger.error(