Merge branch 'main' of https://git.shevkunov.space/FascioSchool/FascioSchoolBot

app/bot/dialogs/flows/events/dialogs.py

@@ -4,7 +4,11 @@ from aiogram_dialog.widgets.text import Case, Const, Format, Jinja
 
 from app.bot.dialogs.templates import event_template
 
+<<<<<<< HEAD
 from .getters import event_getter, events_list_getter, registration_getter
+=======
+from .getters import event_getter, events_list_getter
+>>>>>>> 7e5939394de1e40064ccf364bcfabbbd117d5d32
 from .handlers import change_registration, on_event_selected
 from .states import EventsSG
 
@@ -31,7 +35,10 @@ events_dialog = Dialog(
                 [Const("зарегистрироваться"), Const("отменить регистрацию")],
                 selector="is_registered_to_event",
             ),
+<<<<<<< HEAD
             id="change_registration_btn",
+=======
+>>>>>>> 7e5939394de1e40064ccf364bcfabbbd117d5d32
             on_click=change_registration,
         ),
         Back(Const("Назад")),

app/bot/dialogs/flows/events/getters.py

@@ -5,7 +5,10 @@ from app.infrastructure.database.crud import (
     get_event_by_id,
     get_events_list,
 )
+<<<<<<< HEAD
 from app.infrastructure.database.enums import UserEventStatus
+=======
+>>>>>>> 7e5939394de1e40064ccf364bcfabbbd117d5d32
 from app.infrastructure.database.models import Event
 
 
@@ -34,3 +37,11 @@ async def registration_getter(dialog_manager: DialogManager, **kwargs):
             for ue in user.events
         )
     }
+
+
+async def registraion_getter(dialog_manager: DialogManager, **kwargs):
+    user = dialog_manager.middleware_data["user"]
+    event_id = dialog_manager.dialog_data["selected_event"]
+    return {
+        "is_registered_to_event": any(ue.event_id == event_id for ue in user.events)
+    }

app/bot/dialogs/flows/events/handlers.py

@@ -19,6 +19,7 @@ async def on_event_selected(
     manager.dialog_data["selected_event"] = int(item_id)
     await manager.next()
 
+<<<<<<< HEAD
 
 async def change_registration(
     callback: CallbackQuery,
@@ -39,3 +40,7 @@ async def change_registration(
             await register_user_to_event(
                 manager.middleware_data["session"], user.id, event_id
             )
+=======
+async def change_registration():
+    ...
+>>>>>>> 7e5939394de1e40064ccf364bcfabbbd117d5d32