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

2025-11-14 13:49:37 +03:00
parent 93a425aea9 7e5939394d
commit 343dc8fb5f
5 changed files with 37 additions and 0 deletions
--- a/app/infrastructure/database/crud.py
+++ b/app/infrastructure/database/crud.py
@@ -104,6 +104,7 @@ async def update_event(
        event.end_date = end_date
    await session.commit()
    return event
+<<<<<<< HEAD


 async def register_user_to_event(session: AsyncSession, user_id: int, event_id: int):
@@ -133,3 +134,5 @@ async def unregister_user_to_event(session: AsyncSession, user_id: int, event_id
    ).scalar_one()
    user_event.status = UserEventStatus.CANCELLED.value
    await session.commit()
+=======
+>>>>>>> 7e5939394de1e40064ccf364bcfabbbd117d5d32