diff --git a/src/bot/message_handlers.py b/src/bot/message_handlers.py index 19fb439..a2a926d 100644 --- a/src/bot/message_handlers.py +++ b/src/bot/message_handlers.py @@ -36,7 +36,7 @@ async def get_accounts( mes: Message, ) -> None: await base_handler(bot, mes) - accounts = db.get.get_accounts( + accounts = db.get.get_account_names( engine, mes.from_user.id, to_sort=True, @@ -210,7 +210,7 @@ async def _add_account2( mes.chat.id, "Не корректное название аккаунта", ) - if text in db.get.get_accounts(engine, mes.from_user.id): + if text in db.get.get_account_names(engine, mes.from_user.id): return await send_tmp_message( bot, mes.chat.id, "Аккаунт с таким именем уже существует" ) @@ -332,7 +332,7 @@ async def get_account(bot: AsyncTeleBot, engine: Engine, mes: Message) -> None: if master_pass is None: return await send_tmp_message(bot, mes.chat.id, "Нет мастер пароля") - accounts = db.get.get_accounts( + accounts = db.get.get_account_names( engine, mes.from_user.id, to_sort=True, @@ -355,7 +355,7 @@ async def _get_account2( if text == "/cancel": return await send_tmp_message(bot, mes.chat.id, "Успешная отмена") - if text not in db.get.get_accounts(engine, mes.from_user.id): + if text not in db.get.get_account_names(engine, mes.from_user.id): return await send_tmp_message(bot, mes.chat.id, "Нет такого аккаунта") bot_mes = await bot.send_message(mes.chat.id, "Отправьте мастер пароль") @@ -414,7 +414,7 @@ async def delete_account( if master_pass is None: return await send_tmp_message(bot, mes.chat.id, "Нет мастер пароля") - accounts = db.get.get_accounts( + accounts = db.get.get_account_names( engine, mes.from_user.id, to_sort=True, @@ -443,7 +443,7 @@ async def _delete_account2( if text == "/cancel": return await send_tmp_message(bot, mes.chat.id, "Успешная отмена") - if text not in db.get.get_accounts(engine, mes.from_user.id): + if text not in db.get.get_account_names(engine, mes.from_user.id): return await send_tmp_message(bot, mes.chat.id, "Нет такого аккаунта") bot_mes = await bot.send_message( @@ -502,7 +502,7 @@ async def export(bot: AsyncTeleBot, engine: Engine, mes: Message) -> None: if master_password_from_db is None: return await send_tmp_message(bot, mes.chat.id, "Нет мастер пароля") - if not db.get.get_accounts(engine, mes.from_user.id): + if not db.get.get_account_names(engine, mes.from_user.id): return await send_tmp_message(bot, mes.chat.id, "Нет аккаунтов") bot_mes = await bot.send_message(mes.chat.id, "Отправьте мастер пароль") @@ -529,7 +529,7 @@ async def _export2( "Не подходит мастер пароль", ) - accounts = db.get.get_all_accounts(engine, mes.from_user.id) + accounts = db.get.get_accounts(engine, mes.from_user.id) with ProcessPoolExecutor() as pool: loop = asyncio.get_running_loop() tasks = [] diff --git a/src/db/get.py b/src/db/get.py index 9830ae2..bf06528 100644 --- a/src/db/get.py +++ b/src/db/get.py @@ -17,7 +17,7 @@ def get_master_pass( return result -def get_accounts( +def get_account_names( engine: Engine, user_id: int, *, @@ -34,7 +34,7 @@ def get_accounts( return result -def get_all_accounts(engine: Engine, user_id: int) -> list[models.Account]: +def get_accounts(engine: Engine, user_id: int) -> list[models.Account]: """Returns a list of accounts of a user""" statement = sqlmodel.select(models.Account).where( models.Account.user_id == user_id,