fixup! fix registration,add filter

app/FSM/__init__.py

@@ -0,0 +1,4 @@
+from .states import OrderForm, SearchForm, OrderingForm
+
+
+__all__ = ["SearchForm", "OrderForm", "OrderingForm"]

app/FSM/states.py

@@ -0,0 +1,24 @@
+from aiogram.fsm.state import State, StatesGroup
+
+
+class SearchForm(StatesGroup):
+    search_option = State()
+    data_to_search = State()
+    search_result = State()
+
+
+class OrderForm(StatesGroup):
+    id = State()
+    worker_id = State()
+    status_id = State()
+    counterparty = State()
+    customer = State()
+    commencement_work = State()
+    end_work = State()
+    description = State()
+
+
+class OrderingForm(StatesGroup):
+    tools_list = State()
+
+

app/filters/Filters.py

@@ -23,3 +23,7 @@ class CommandFilter(BaseFilter):
     async def __call__(self, message: Message) -> bool:
         return message.text.startswith(tuple(self.commands.keys()))
 
+
+class IsRegister(BaseFilter):
+    async def __call__(self, message: Message | CallbackQuery, **data: dict[str, Any]) -> bool:
+        return data.get("through_registration") is True

app/handlers/admin.py

@@ -1,11 +1,9 @@
-import time
 import re
-from aiogram import Router, Bot, F
-from aiogram.types import (Message, ChatMemberUpdated, FSInputFile, CallbackQuery, ReplyKeyboardRemove)
 from loguru import logger
+from aiogram import Router, Bot, F
+from aiogram.types import Message, CallbackQuery
 from handlers.registration import registration_confirm
-from filters.Filters import IsAdmin, CommandFilter
-from database import async_session_
+from filters.Filters import IsAdmin
 
 admin_router = Router()
 

app/handlers/orders.py

@@ -33,24 +33,6 @@ find_order_params = {"search_by_name": "Поиск по названию", "sear
                      "search_by_id": "Поиск по номеру заказа", "search_by_customer": "Поиск по заказчику"}
 
 
-class SearchForm(StatesGroup):
-    search_option = State()
-    data_to_search = State()
-    search_result = State()
-
-
-class OrderForm(StatesGroup):
-    id = State()
-    worker_id = State()
-    status_id = State()
-    counterparty = State()
-    customer = State()
-    commencement_work = State()
-    end_work = State()
-
-    description = State()
-
-
 @orders_router.message(Command(commands="orders"))
 async def orders_menu(message: Message):
     order_main_upd = order_main_update if await IsAdmin()(message) else {}

app/handlers/registration.py

@@ -1,17 +1,18 @@
 import os
 from asyncio import Event, wait_for, TimeoutError
-
 from aiogram import Router, Bot
 from aiogram.filters import CommandStart
 from aiogram.types import Message, User
-
 from sqlalchemy import insert, select
-
+from loguru import logger
 from keyboards import create_inline_kb
 from database import async_session_, Worker
+from filters import IsRegister
+
 
 registration_router = Router()
 
+registration_router.message.filter(IsRegister() or CommandStart())
 registration_confirm: dict[int, Event] = {}
 user_info_template = ("Новый пользователь ждет регистрации:\n"
                       "Имя: {}\n"
@@ -23,13 +24,11 @@ admins_ids = list(map(int, os.getenv("BOT_ADMINS").split(",")))
 
 
 @registration_router.message(CommandStart())
-async def registration_command(message: Message, bot: Bot):
+async def start_command(message: Message, bot: Bot):
     async with async_session_() as session:
-        async with session.begin():
-            result = await session.execute(select(Worker).where(Worker.telegram_id == message.from_user.id))
-            user = result.scalars().first()
+        result = await session.execute(select(Worker).where(Worker.telegram_id == message.from_user.id))
+        user = result.scalars().first()
     if not user:
-
         user = message.from_user
         dict_for_inline = {f'reg_@{user.id}': 'Allow', f'del_@{user.id}': 'Reject'}
         user_info = user_info_template.format(user.first_name, user.last_name if user.last_name else 'Не указана',
@@ -39,8 +38,11 @@ async def registration_command(message: Message, bot: Bot):
                 await bot.send_message(chat_id=admin, text=user_info)
                 await bot.send_message(chat_id=admin, text='Зарегистрировать пользователя',
                                        reply_markup=create_inline_kb(width=2, **dict_for_inline))
-            except Exception as err:
-                pass
+                await message.answer("Запрос на регистрацию  отправлен администратору, ожидайте подтверждения.")
+
+            except Exception:
+                logger.error(f"{start_command.__name__} failed")
+
         reg_confirm = Event()
         registration_confirm[user.id] = reg_confirm
         try:
@@ -49,7 +51,7 @@ async def registration_command(message: Message, bot: Bot):
                 async with local_session.begin():
                     local_session.add(Worker(telegram_id=user.id, name=user.first_name))
 
-            await message.answer("Регистрация подтверждена")
+            await message.answer("Регистрация подтверждена, для просмотра доступных действий нажмите кнопку 'MENU'")
         except TimeoutError:
             await message.answer("Время ожидания истекло.")
 
@@ -57,3 +59,8 @@ async def registration_command(message: Message, bot: Bot):
 
     else:
         await message.answer("Работа бота возобновлена")
+
+
+@registration_router.message()
+async def catch_message(message: Message):
+    await message.answer("Для работы с ботом, требуется регистрация\nНажмите /start для регистрации")

app/main.py

@@ -4,7 +4,7 @@ from dotenv import load_dotenv
 from aiogram import Dispatcher, Bot
 from handlers import *
 from keyboards import set_main_menu
-from middlewares import AccessCheckMiddleware
+from middlewares import SessionMiddleware
 
 load_dotenv(".env")
 bot = Bot(token=os.getenv("TOKEN"))
@@ -16,7 +16,7 @@ async def main() -> None:
     dp.startup.register(set_main_menu)
     dp.include_router(registration_router)
     dp.include_router(admin_router)
-    dp.update.outer_middleware(AccessCheckMiddleware())
+    dp.update.outer_middleware(SessionMiddleware())
     dp.include_router(orders_router)
     dp.include_router(components_router)
 

app/middlewares/__init__.py

@@ -1,4 +1,4 @@
-from .outer_middlewares import AccessCheckMiddleware
+from .outer_middlewares import SessionMiddleware
 
 
-__all__ = ["AccessCheckMiddleware"]
+__all__ = ["SessionMiddleware"]

app/middlewares/outer_middlewares.py

@@ -1,29 +1,29 @@
-import logging
 from typing import Any, Awaitable, Callable, Dict
 from aiogram import BaseMiddleware, Bot
 from aiogram.types import TelegramObject
-from database import async_session_, Worker
 from sqlalchemy import select
+from loguru import logger
+from database import async_session_, Worker
 
 
-
-class AccessCheckMiddleware(BaseMiddleware):
+class SessionMiddleware(BaseMiddleware):
     sessions_in_memory_db = set()
+
     async def __call__(
             self,
             handler: Callable[[TelegramObject, Dict[str, Any]], Awaitable[Any]],
             event: TelegramObject,
             data: Dict[str, Any]
     ) -> Any:
+        logger.info("Session check")
         event_data = event.message or event.callback_query
         user = event_data.from_user.id
         if user not in self.sessions_in_memory_db:
             async with async_session_() as session:
-                async with session.begin():
-                    result = await session.execute(select(Worker).where(Worker.telegram_id == event_data.from_user.id))
-                    user = result.scalars().first()
-        if user:
-            self.sessions_in_memory_db.add(event_data.from_user.id)
-            return await handler(event, data)
-        return None
-
+                result = await session.execute(select(Worker).where(Worker.telegram_id == event_data.from_user.id))
+                user_in_db = result.scalars().first()
+            if not user_in_db:
+                data["through_registration"] = True
+            else:
+                self.sessions_in_memory_db.add(user)
+        return await handler(event, data)