some fixes

pyproject.toml

@@ -20,6 +20,7 @@ django-bootstrap5 = "^24.2"
 psycopg2-binary = "^2.9.9"
 django-material-admin = "^1.8.6"
 django-viewflow = "^2.0.2"
+babel = "^2.16.0"
 
 
 [tool.poetry.group.dev.dependencies]

requirements/dev.txt

@@ -1,6 +1,7 @@
 anyio==4.4.0 ; python_version >= "3.12" and python_version < "4.0"
 apscheduler==3.10.4 ; python_version >= "3.12" and python_version < "4.0"
 asgiref==3.8.1 ; python_version >= "3.12" and python_version < "4.0"
+babel==2.16.0 ; python_version >= "3.12" and python_version < "4.0"
 build==1.2.1 ; python_version >= "3.12" and python_version < "4.0"
 cachecontrol[filecache]==0.14.0 ; python_version >= "3.12" and python_version < "4.0"
 certifi==2024.8.30 ; python_version >= "3.12" and python_version < "4.0"

requirements/prod.txt

@@ -1,6 +1,7 @@
 anyio==4.4.0 ; python_version >= "3.12" and python_version < "4.0"
 apscheduler==3.10.4 ; python_version >= "3.12" and python_version < "4.0"
 asgiref==3.8.1 ; python_version >= "3.12" and python_version < "4.0"
+babel==2.16.0 ; python_version >= "3.12" and python_version < "4.0"
 build==1.2.1 ; python_version >= "3.12" and python_version < "4.0"
 cachecontrol[filecache]==0.14.0 ; python_version >= "3.12" and python_version < "4.0"
 certifi==2024.8.30 ; python_version >= "3.12" and python_version < "4.0"

src/bot/bot_interface.py

@@ -203,20 +203,20 @@ async def build_main_handler():
             ],
             UserStates.HELP: [
                 CallbackQueryHandler(
-                    start_handler,
-                    pattern=f'^{UserStates.START.value}$',
+                    help_handler,
+                    pattern=f'^{UserStates.HELP.value}$',
                 ),
             ],
             UserStates.SCHEDULE: [
                 CallbackQueryHandler(
-                    start_handler,
-                    pattern=f'^{UserStates.START.value}$',
+                    schedule_handler,
+                    pattern=f'^{UserStates.SCHEDULE.value}$',
                 ),
             ],
             UserStates.LEFT_LESSONS: [
                 CallbackQueryHandler(
                     left_lessons_handler,
-                    pattern=f'^{UserStates.START.value}$',
+                    pattern=f'^{UserStates.LEFT_LESSONS.value}$',
                 ),
             ],
             UserStates.FEEDBACK_SUBJECT: [

src/bot/handlers/success_registration.py

@@ -1,5 +1,5 @@
 # TODO: Нам не нужен этот хендлер в виде команды. Он нам нужен как обработчик
-from telegram import Bot, Update, ReplyKeyboardRemove
+from telegram import Update, ReplyKeyboardRemove
 from telegram.ext import ContextTypes, MessageHandler, filters
 
 from bot.messages_texts.constants import REGISTRATION_SUCCESS_MSG
@@ -25,9 +25,6 @@ async def success_registration_webapp(
         chat_id=telegram_id,
         message_id=registration_message_id,
     )
-    # Обновляем команды меню для пользователя
-    bot_instance = Bot()
-    await bot_instance._update_bot_commands(update.effective_chat)
 
 success_registration_webapp_handler = MessageHandler(
     filters.StatusUpdate.WEB_APP_DATA,

src/core/config/settings_base.py

@@ -97,7 +97,7 @@
 
 LANGUAGE_CODE = 'ru-RU'
 
-TIME_ZONE = 'Europe/Moscow'
+TIME_ZONE = 'UTC'
 
 USE_I18N = True
 

src/schooling/forms.py

@@ -2,7 +2,7 @@
 
 from schooling.models import Lesson
 from schooling.validators.form_validators import (
-    validate_intersections_time_periods, validate_lesson_datetime,
+    validate_intersections_time_periods,
     validate_lesson_duration, validate_paid_lessons,
     validate_student_last_login, validate_teacher_last_login,
     validate_teacher_subjects)
@@ -48,9 +48,7 @@ def clean(self):
         test_lesson = cleaned_data.get('test_lesson')
 
         # Валидация даты и времени начала урока
-        if datetime_start:
-            validate_lesson_datetime(datetime_start)
-        else:
+        if not datetime_start:
             raise forms.ValidationError(
                 'Дата и время начала урока обязательны для заполнения.')
 

src/schooling/signals_bot.py

@@ -119,7 +119,7 @@ async def get_message_text(instance):
 
     message_text = (
         f'Вам назначено занятие на {start_time_formatted}, '
-        f'продолжительность занятия {duration}.\n'
+        f'продолжительность занятия {duration} минут.\n'
         f'Тема: {instance.name}.\n'
         f'Преподаватель: {instance.teacher_id}\n'
         f'Ученик: {instance.student_id}\n'

src/schooling/utils.py

@@ -1,6 +1,9 @@
+from babel.dates import format_datetime as form_date
+
 def format_datetime(dt):
     """Функция для форматирования даты и времени в удобный формат."""
-    return dt.strftime('%d %B, в %H.%M')
+    date = form_date(dt, locale='ru')
+    return date
 
 
 def format_lesson_duration(start_time, end_time):

src/schooling/validators/form_validators.py

@@ -87,13 +87,6 @@ def validate_teacher_subjects(subject: str, teacher: Teacher) -> None:
         )
 
 
-def validate_lesson_datetime(datetime_start):
-    """Валидация даты и времени начала урока."""
-    if datetime_start < timezone.now():
-        raise ValidationError(
-            'Дата и время начала урока должны быть в будущем.')
-
-
 def validate_lesson_duration(duration):
     """Валидация продолжительности урока."""
     if duration < 30 or duration > 180: