Merge pull request #30 from ikhit/master

add redis set timer command

app/admin/handlers/admin_handlers/superuser_handlers.py

@@ -20,6 +20,7 @@
     SUPERUSER_SPECIAL_BUTTONS,
     SUPERUSER_SPECIAL_OPTIONS,
 )
+from redis_db.connect import get_redis_connection
 from bot.exceptions import message_exception_handler
 from models.models import User, RoleEnum
 from crud.request_to_manager import get_manager_stats
@@ -336,7 +337,10 @@ async def check_and_set_new_timer(
 ):
     """Проверить и выставить новый таймер."""
     try:
-        # await change_timer(message.text, session)
+        redis_client = await get_redis_connection()
+
+        await redis_client.set("timeout", int(message.text))
+        await redis_client.close()
         await message.answer(
             f"Новый таймер на {message.text} секунд установлен!",
             reply_markup=await get_inline_keyboard(

app/bot/handlers.py

@@ -2,13 +2,16 @@
 
 from aiogram import Router, F
 from aiogram.filters import CommandStart, Command
+from aiogram.fsm.context import FSMContext
 from aiogram.types import Message
 from sqlalchemy.ext.asyncio import AsyncSession
 
 from admin.keyboards.keyboards import get_inline_keyboard
 from admin.admin_settings import MAIN_MENU_BUTTONS
 from bot.bot_const import (
-    ADMIN_NEGATIVE_ANSWER, ADMIN_POSITIVE_ANSWER, START_MESSAGE
+    ADMIN_NEGATIVE_ANSWER,
+    ADMIN_POSITIVE_ANSWER,
+    START_MESSAGE,
 )
 from models.models import RoleEnum
 from crud.users import create_user_id, get_role_by_tg_id, is_user_in_db
@@ -53,9 +56,13 @@ async def cmd_admin(message: Message, session: AsyncSession) -> None:
     log_error_text="Ошибка при обработке команды /start."
 )
 @router.message(CommandStart())
-async def cmd_start(message: Message, session: AsyncSession) -> None:
+async def cmd_start(
+    message: Message, state: FSMContext, session: AsyncSession
+) -> None:
     """Выводит приветствие пользователя."""
 
+    await state.clear()
+
     user_id = get_user_id(message)
 
     redis_client = await get_redis_connection()

app/core/init_db.py

@@ -1,11 +1,10 @@
 from admin.admin_settings import PORTFOLIO_DEFAULT_DATA
 from admin.admin_settings import admin_list
-from crud.timer import get_timer
 from crud.users import create_user_id
 from crud.user_crud import user_crud
 from core.db import AsyncSessionLocal
 from crud.portfolio_projects_crud import portfolio_crud
-from models.models import Timer, RoleEnum
+from models.models import RoleEnum
 
 
 async def add_portfolio():
@@ -27,12 +26,3 @@ async def set_admin():
                 await user_crud.update(user, RoleEnum.ADMIN , session)
 
 
-async def set_timer():
-    """Установить таймер активности."""
-    async with AsyncSessionLocal() as session:
-        if not await get_timer(session):
-            timer = Timer()
-            session.add(timer)
-            await session.commit()
-            await session.refresh(timer)
-            return timer

app/main.py

@@ -9,7 +9,7 @@
 from bot.callbacks import router as callback_router
 from bot.fsm_contexts.manager_context import router as fsm_context_router
 from bot.fsm_contexts.feedback_context import router as feedback_context
-from core.init_db import add_portfolio, set_admin, set_timer
+from core.init_db import add_portfolio, set_admin
 from admin.handlers.admin_handlers import admin_router
 from loggers.log import setup_logging
 
@@ -38,7 +38,6 @@ async def main() -> None:
         dispatcher.update.middleware(
             DataBaseSession(session_pool=AsyncSessionLocal)
         )
-        await set_timer()
         await add_portfolio()
         await set_admin()
         await dispatcher.start_polling(bot)

app/redis_db/connect.py

@@ -5,5 +5,5 @@ async def get_redis_connection():
     """Подключение к Redis."""
 
     return await aioredis.from_url(
-        "redis://158.160.77.163:6379", decode_responses=True  # localhost:
+        "redis://localhost", decode_responses=True  # localhost:158.160.77.163:6379
     )