MVP

app/handlers/__init__.py

@@ -0,0 +1,6 @@
+from .admin import admin_router
+from .registration import registration_router
+from .orders import orders_router
+from .components import components_router
+
+__all__ = ["admin_router", "orders_router", "registration_router", "components_router"]

app/handlers/admin.py

@@ -0,0 +1,34 @@
+import time
+import re
+from aiogram import Router, Bot, F
+from aiogram.types import (Message, ChatMemberUpdated, FSInputFile, CallbackQuery, ReplyKeyboardRemove)
+from loguru import logger
+from handlers.registration import registration_confirm
+from filters.Filters import IsAdmin, CommandFilter
+from database import async_session_
+
+admin_router = Router()
+
+admin_router.message.filter(IsAdmin())
+
+
+regex = re.compile(r'(del|reg) @.+')
+
+
+@admin_router.callback_query(lambda x: re.fullmatch(regex, x.data))
+async def reg_del_command(callback: CallbackQuery, bot: Bot):
+    logger.warning(f'Received command: {callback.data}')
+    new_user_id = int(re.search(r'\d+', callback.data).group())
+    if callback.data.startswith('reg'):
+        registration_confirm[new_user_id].set()
+        await callback.answer("Новый пользователь зарегистрирован")
+        await callback.message.delete()
+
+
+@admin_router.message(F.text.startswith('@msg'))
+async def send_message_command(message: Message, bot: Bot):
+    chat_id = re.search(r'(\d+)', message.text).group()
+    print(chat_id)
+    await bot.send_message(text='Ronis->' + message.text.strip('@msg_' + chat_id), chat_id=chat_id)
+
+

app/handlers/components.py

@@ -0,0 +1,9 @@
+from aiogram import Router
+from aiogram.filters import Command
+from aiogram.types import Message
+
+components_router = Router()
+@components_router.message(Command(commands="components"))
+async def components(message: Message):
+    await message.answer("Функция пока не доступна")
+    await message.delete()

app/handlers/orders.py

@@ -0,0 +1,230 @@
+import asyncio
+import os
+from pathlib import Path
+import re
+from aiogram import Router, Bot, F
+from aiogram.filters import CommandStart, Command
+from aiogram.types import Message, CallbackQuery, FSInputFile, InputMediaPhoto, InputMediaVideo
+from aiogram.exceptions import AiogramError
+from aiogram.fsm.state import State, StatesGroup
+from aiogram.fsm.context import FSMContext
+from sqlalchemy import select, insert
+from loguru import logger
+from filters import IsAdmin
+from keyboards import create_inline_kb, commands, button_create
+from database import async_session_, Order, Worker
+
+orders_router = Router()
+
+# orders_router.message.filter()
+
+order_operation_base = {"add_order_photo": "Добавить фото",
+                        "get_order_photo": "Получить фото",
+                        "get_order_components": "Получить список комплектующих",
+                        "get_order_documentation": "Получить документацию"
+                        }
+order_operation_update = {"add_order_documentation": "Добавить документацию"}
+
+order_main = {"find_orders": "Найти заказ"}
+order_main_update = {"create_order": "Создать заказ"}
+
+find_order_params = {"search_by_name": "Поиск по названию", "search_by_description": "Поиск по описанию ",
+                     "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 {}
+    await message.answer(text="Доступные действия с заказами:",
+                         reply_markup=create_inline_kb(width=1, **order_main, **order_main_upd))
+
+
+@orders_router.callback_query(lambda x: x.data.startswith("create_order"))
+async def get_order_worker_id(callback: CallbackQuery, state: FSMContext):
+    await state.set_state(OrderForm.worker_id)
+    await callback.message.answer("Введите id сборщика который будет собирать заказ:",
+                                  reply_markup=create_inline_kb(**{f"{callback.from_user.id}": "Ввести мой id"}))
+    await callback.message.delete()
+
+
+@orders_router.callback_query(OrderForm.worker_id)
+async def get_order_counterparty(message: Message | CallbackQuery, state: FSMContext):
+    if isinstance(message, Message):
+        worker_id = int(message.text)
+        msg = message
+    else:
+        worker_id = int(message.data)
+        msg = message.message
+    await msg.answer("Введите данные заказчика ")
+    await msg.delete()
+    await state.update_data(worker_id=worker_id)
+    await state.set_state(OrderForm.customer)
+
+
+# @orders_router.callback_query(OrderForm.counterparty)
+# async def get_order_customer(message: Message, state: FSMContext):
+#
+
+@orders_router.message(OrderForm.customer)
+async def create_order(message: Message, state: FSMContext):
+    await message.answer("Введите описание заказа в виде ключевых слов  (АВР, ПСС, НКУ и т.д.) )")
+    await state.update_data(customer=message.text)
+    await state.set_state(OrderForm.description)
+
+
+@orders_router.message(OrderForm.description)
+async def create_order(message: Message, state: FSMContext):
+    await state.update_data(description=message.text)
+    order_ = await state.get_data()
+    async with async_session_() as session:
+        async with session.begin():
+            session.add(Order(**order_))
+
+    await state.clear()
+    await message.answer("Заказ успешно создан ")
+
+
+@orders_router.callback_query(lambda x: x.data == "find_orders")
+async def find_orders_menu(callback: CallbackQuery, state: FSMContext):
+    await callback.message.edit_text(text="Выберите параметры поиска:")
+    await callback.message.edit_reply_markup(reply_markup=create_inline_kb(width=1, **find_order_params))
+    await state.set_state(SearchForm.search_option)
+
+
+@orders_router.callback_query(SearchForm.search_option)
+async def search_by_item(callback: CallbackQuery, state: FSMContext):
+    search_option = re.search(r"^search_by_(\w+)", callback.data).group(1)
+    await state.update_data(search_option=search_option)
+    await state.set_state(SearchForm.data_to_search)
+    await callback.message.answer(text="🔍 Введите данные для поиска")
+    await callback.message.delete()
+
+
+@orders_router.message(SearchForm.data_to_search)
+async def search_by_item(message: Message, state: FSMContext):
+    async with async_session_() as local_session:
+        search_opt = await state.get_value("search_option")
+        col = getattr(Order, search_opt)
+        await message.answer(message.text)
+        result = await local_session.execute(
+            select(Order).where(col.ilike(f"%{message.text}%") if search_opt != "id" else col == int(message.text)))
+        selected_orders = result.scalars().all()
+    if selected_orders:
+        await message.answer(text="Список заказов", reply_markup=create_inline_kb(width=1, **dict(
+            (f"show_order_{order.id}", order.description or "Отсутствует") for order in selected_orders)))
+        await state.update_data(search_result=selected_orders)
+        await state.set_state(SearchForm.search_result)
+    else:
+        await message.answer(text="Заказов по вашему запросу не найдено")
+        await state.clear()
+
+
+@orders_router.callback_query(SearchForm.search_result)
+async def show_order(callback: CallbackQuery, state: FSMContext):
+    order_id = int(re.search(r"(\d+)", callback.data).group())
+
+    try:
+        async with async_session_() as local_session:
+            result = await local_session.execute(select(Order).filter(Order.id == order_id))
+            order = result.scalars().first()
+
+    except Exception as err:
+        logger.warning(err)
+
+    order_operation_upd = order_operation_update if await IsAdmin()(callback) else {}
+
+    if order:
+        await callback.message.answer(text=f"Номер заказа: {order.id}\n"
+                                           f"Заказчик: {order.customer}\n"
+                                           f"Статус: {order.status_id}\n"
+                                           f"Дата начала работ: {order.commencement_work}\n"
+                                           f"Дата отгрузки: {order.end_work}\n"
+                                           f"Дата создания: {order.created_at}\n"
+                                           f"Описание: {order.description}",
+                                      reply_markup=create_inline_kb(width=2, **dict(
+                                          (f"{clbk}_{order.id}", text) for clbk, text in order_operation_base.items()))
+                                      )
+
+        await callback.message.delete()
+        await state.clear()
+
+
+@orders_router.callback_query(lambda x: x.data.startswith("get_order_photo"))
+async def send_order_photos(callback: CallbackQuery, bot: Bot):
+    order_id = callback.data.split("_")[-1]
+    media_item: Path
+    media_group = []
+    os.makedirs(Path(f"./photos/{order_id}/"), exist_ok=True)
+    media_path = Path(f"./photos/{order_id}/").iterdir()
+    if not (media_item := next(media_path, None)):
+        text = f"Фото по заказу \"{order_id}\" отсутствуют "
+    else:
+        text = (f"Заказ: №{order_id}\n"
+                f"")
+    await bot.send_message(chat_id=callback.from_user.id, text=text)
+    while media_item or media_group:
+        if len(media_group) == 10 or (media_group and not media_item):
+            await bot.send_media_group(chat_id=callback.from_user.id, media=media_group)
+            media_group.clear()
+        if media_item:
+            try:
+                input_type = InputMediaPhoto if media_item.suffix == ".jpg" else InputMediaVideo
+                media_group.append(input_type(media=FSInputFile(media_item)))
+            except Exception as err:
+                logger.error(f"Ошибка при обработке {media_path}: {err}")
+
+            media_item = next(media_path, None)
+    await asyncio.sleep(600)
+    await callback.message.delete()
+
+
+@orders_router.callback_query(lambda x: x.data.startswith("add_order_photo"))
+async def reply_for_photo(callback: CallbackQuery, bot: Bot):
+    await bot.send_message(text=f"Заказ: {callback.data.split("_")[-1]}\n"
+                                "Прикрепите файлы ответив на это сообщение сдвинув его влево, либо выберите 'ответить'",
+                           chat_id=callback.from_user.id)
+    await callback.message.delete()
+
+
+@orders_router.message(
+    F.reply_to_message)
+async def add_order_photo(message: Message, bot: Bot):
+    order_id = re.search(r"(\d+)", message.reply_to_message.text).group()
+    order_photos_path = f"/app/photos/{order_id}/"
+    os.makedirs(order_photos_path, exist_ok=True)
+
+    item = message.video or message.photo[-1]
+    file_extension = "jpg" if message.photo else "mp4"
+    try:
+        file = await bot.get_file(item.file_id)
+
+        await bot.download_file(file.file_path, destination=f"{order_photos_path}/{file.file_id}.{file_extension}",
+                                timeout=3600)
+        await message.answer(f"Медиа файл {file.file_id[:10]} успешно прикреплен к заказу  №{order_id}")
+
+    except AiogramError as err:
+        logger.error(err)
+
+    await message.delete()
+    try:
+        await bot.delete_message(chat_id=message.chat.id, message_id=message.reply_to_message.message_id)
+    except:
+        pass

app/handlers/registration.py

@@ -0,0 +1,50 @@
+import os
+from asyncio import Event
+
+from aiogram import Router, Bot
+from aiogram.filters import CommandStart
+from aiogram.types import Message, User
+
+from sqlalchemy import insert, select
+from sqlalchemy.orm import selectinload
+
+from keyboards import create_inline_kb
+from database import async_session_, Worker
+
+registration_router = Router()
+
+registration_confirm: dict[int, Event] = {}
+user_info_template = ("Новый пользователь ждет регистрации:\n"
+                      "Имя: {}\n"
+                      "Фамилия: {}\n"
+                      "Юзернейм: @{}\n"
+                      "ID: @msg_{}\n")
+
+
+@registration_router.message(CommandStart())
+async def registration_command(message: Message, bot: Bot):
+    admins_ids = os.getenv("BOT_ADMINS").split(",")
+    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()
+    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 'Не указана',
+                                              user.username if user.username else 'Не указан', user.id)
+        for admin in admins_ids:
+            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))
+        reg_confirm = Event()
+        registration_confirm[user.id] = reg_confirm
+        if await reg_confirm:
+            async with async_session_() as local_session:
+                async with local_session.begin():
+                    local_session.add(Worker(telegram_id=int(user.id), name=user.first_name))
+            del registration_confirm[user.id]
+
+    else:
+        await message.answer("Работа бота возобновлена")