7

backend/app2/bot/handlers/__init__.py

@@ -0,0 +1,6 @@
+"""Handlers initialization"""
+from .callbacks import router as callbacks_router
+from .start import router as start_router
+from .callbacks import get_updated_keyboard
+
+__all__ = ['callbacks_router', 'start_router', 'get_updated_keyboard']

backend/app2/bot/handlers/callbacks.py

@@ -0,0 +1,70 @@
+"""Handlers for callback queries"""
+from aiogram import Router, types
+from aiogram.types import InlineKeyboardMarkup, InlineKeyboardButton
+from sqlalchemy.orm import Session
+from ...database import get_db
+from ... import models
+from ..config import RequestStatus
+
+router = Router()
+
+@router.callback_query(lambda c: c.data and c.data.startswith('status_'))
+async def process_status_button(callback_query: types.CallbackQuery):
+    """
+    Handle status update button clicks.
+    Updates request status in database and updates message in Telegram.
+    """
+    try:
+        # Parse callback data
+        _, request_id, new_status = callback_query.data.split('_')
+        request_id = int(request_id)
+        
+        # Get database session
+        db = next(get_db())
+        
+        # Update request status
+        request = db.query(models.Request).filter(models.Request.id == request_id).first()
+        if request:
+            request.status = new_status
+            db.commit()
+            
+            # Update message in Telegram
+            await callback_query.message.edit_text(
+                f"Заявка №{request_id}\n"
+                f"Статус: {new_status}\n"
+                f"Описание: {request.description}",
+                reply_markup=get_updated_keyboard(request_id, new_status)
+            )
+            
+            await callback_query.answer("Статус успешно обновлен!")
+        else:
+            await callback_query.answer("Заявка не найдена!", show_alert=True)
+            
+    except Exception as e:
+        print(f"Error in process_status_button: {e}")
+        await callback_query.answer(
+            "Произошла ошибка при обновлении статуса",
+            show_alert=True
+        )
+
+def get_updated_keyboard(request_id: int, current_status: str) -> InlineKeyboardMarkup:
+    """Create keyboard with status update buttons"""
+    keyboard = InlineKeyboardMarkup(inline_keyboard=[])
+    
+    if current_status != RequestStatus.IN_PROGRESS:
+        keyboard.inline_keyboard.append([
+            InlineKeyboardButton(
+                text="В работе",
+                callback_data=f"status_{request_id}_{RequestStatus.IN_PROGRESS}"
+            )
+        ])
+    
+    if current_status != RequestStatus.COMPLETED:
+        keyboard.inline_keyboard.append([
+            InlineKeyboardButton(
+                text="Завершено",
+                callback_data=f"status_{request_id}_{RequestStatus.COMPLETED}"
+            )
+        ])
+    
+    return keyboard

backend/app2/bot/handlers/start.py

@@ -0,0 +1,11 @@
+"""Handler for start command and other basic commands"""
+from aiogram import Router, types
+from aiogram.filters import Command
+from ..config import settings
+
+router = Router()
+
+@router.message(Command("start"))
+async def cmd_start(message: types.Message):
+    """Handle /start command"""
+    await message.answer("Бот для обработки заявок запущен!")

backend/app2/bot/handlers/status.py

@@ -0,0 +1,61 @@
+from aiogram import types, F
+from logging import getLogger
+from sqlalchemy.orm import Session
+from ...database import get_db
+from ...crud import requests
+from ..bot import dp
+from ..keyboards import create_status_keyboard
+from ..messages import format_request_message
+from ..constants import STATUS_LABELS
+
+logger = getLogger(__name__)
+
+@dp.callback_query(F.data.startswith("status_"))
+async def process_status_update(callback: types.CallbackQuery):
+    try:
+        parts = callback.data.split("_")
+        logger.info(f"Received callback data: {callback.data}")
+
+        if len(parts) < 3:
+            logger.error(f"Invalid callback data format: {parts}")
+            await callback.answer("Неверный формат данных", show_alert=True)
+            return
+
+        request_id = int(parts[1])
+        new_status = "_".join(parts[2:]) if len(parts) > 3 else parts[2]
+
+        logger.info(
+            f"Processing status update: request_id={request_id}, new_status={new_status}"
+        )
+
+        db = next(get_db())
+        try:
+            updated_request = requests.update_request_status(db, request_id, new_status)
+            if not updated_request:
+                logger.warning(f"Request not found: {request_id}")
+                await callback.answer("Заявка не найдена", show_alert=True)
+                return
+
+            new_message = format_request_message(updated_request)
+            new_keyboard = create_status_keyboard(request_id, new_status)
+
+            await callback.message.edit_text(
+                text=new_message, parse_mode="HTML", reply_markup=new_keyboard
+            )
+
+            await callback.answer(f"Статус обновлен: {STATUS_LABELS[new_status]}")
+            logger.info(
+                f"Successfully updated request {request_id} to status {new_status}"
+            )
+
+        except ValueError as e:
+            logger.error(f"Value error while updating status: {e}")
+            await callback.answer(str(e), show_alert=True)
+        finally:
+            db.close()
+
+    except Exception as e:
+        logger.error(f"Error processing callback: {e}", exc_info=True)
+        await callback.answer(
+            "Произошла ошибка при обновлении статуса", show_alert=True
+        )